diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt index f7e65ad..38b2ea0 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt @@ -769,7 +769,7 @@ class AudioContentDetailActivity : BaseActivity( } if (creator.isNotification) { - layoutUserProfile.ivNotification.setImageResource(R.drawable.btn_notification_selected) + layoutUserProfile.ivNotification.setImageResource(R.drawable.btn_following_big) layoutUserProfile.ivNotification.setOnClickListener { viewModel.unFollow(creator.creatorId) } } else { - layoutUserProfile.ivNotification.setImageResource(R.drawable.btn_notification) + layoutUserProfile.ivNotification.setImageResource(R.drawable.btn_follow_big) layoutUserProfile.ivNotification.setOnClickListener { viewModel.follow(creator.creatorId) } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/follow/UserFollowerListAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/follow/UserFollowerListAdapter.kt index c3c8bd5..fa7fe22 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/follow/UserFollowerListAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/follow/UserFollowerListAdapter.kt @@ -31,13 +31,13 @@ class UserFollowerListAdapter( if (item.isFollow != null) { binding.ivNotification.visibility = View.VISIBLE if (item.isFollow) { - binding.ivNotification.setImageResource(R.drawable.btn_notification_selected) + binding.ivNotification.setImageResource(R.drawable.btn_following_big) binding.ivNotification.setOnClickListener { onClickUnRegisterNotification(item.userId) clear() } } else { - binding.ivNotification.setImageResource(R.drawable.btn_notification) + binding.ivNotification.setImageResource(R.drawable.btn_follow_big) binding.ivNotification.setOnClickListener { onClickRegisterNotification(item.userId) clear() diff --git a/app/src/main/java/kr/co/vividnext/sodalive/following/FollowingCreatorAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/following/FollowingCreatorAdapter.kt index 77df191..a1b6631 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/following/FollowingCreatorAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/following/FollowingCreatorAdapter.kt @@ -32,7 +32,7 @@ class FollowingCreatorAdapter( binding.ivNotification.visibility = View.VISIBLE if (item.isFollow) { - binding.ivNotification.setImageResource(R.drawable.btn_notification_selected) + binding.ivNotification.setImageResource(R.drawable.btn_following_big) binding.ivNotification.setOnClickListener { val index = items.indexOf(item) val copyItem = item.copy(isFollow = false) @@ -42,7 +42,7 @@ class FollowingCreatorAdapter( onClickUnRegisterNotification(item.creatorId) } } else { - binding.ivNotification.setImageResource(R.drawable.btn_notification) + binding.ivNotification.setImageResource(R.drawable.btn_follow_big) binding.ivNotification.setOnClickListener { val index = items.indexOf(item) val copyItem = item.copy(isFollow = true) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt index 05d787b..1870d5f 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt @@ -800,7 +800,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB if (response.creatorId != SharedPreferenceManager.userId) { binding.ivCreatorFollow.visibility = View.VISIBLE if (response.isFollowing) { - binding.ivCreatorFollow.setImageResource(R.drawable.btn_select_checked) + binding.ivCreatorFollow.setImageResource(R.drawable.btn_following) binding.ivCreatorFollow.setOnClickListener { viewModel.creatorUnFollow( creatorId = response.creatorId, @@ -808,7 +808,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB ) } } else { - binding.ivCreatorFollow.setImageResource(R.drawable.btn_plus_round) + binding.ivCreatorFollow.setImageResource(R.drawable.btn_follow) binding.ivCreatorFollow.setOnClickListener { viewModel.creatorFollow( creatorId = response.creatorId, diff --git a/app/src/main/res/drawable-xxhdpi/btn_follow.png b/app/src/main/res/drawable-xxhdpi/btn_follow.png index df22156..67261a5 100644 Binary files a/app/src/main/res/drawable-xxhdpi/btn_follow.png and b/app/src/main/res/drawable-xxhdpi/btn_follow.png differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_follow_big.png b/app/src/main/res/drawable-xxhdpi/btn_follow_big.png new file mode 100644 index 0000000..da6562c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_follow_big.png differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_following.png b/app/src/main/res/drawable-xxhdpi/btn_following.png index e9507dd..0bdb2d5 100644 Binary files a/app/src/main/res/drawable-xxhdpi/btn_following.png and b/app/src/main/res/drawable-xxhdpi/btn_following.png differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_following_big.png b/app/src/main/res/drawable-xxhdpi/btn_following_big.png new file mode 100644 index 0000000..e2536c9 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_following_big.png differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_notification.png b/app/src/main/res/drawable-xxhdpi/btn_notification.png deleted file mode 100644 index 4508191..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_notification.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_notification_selected.png b/app/src/main/res/drawable-xxhdpi/btn_notification_selected.png deleted file mode 100644 index 6f17a44..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_notification_selected.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_audio_content_detail.xml b/app/src/main/res/layout/activity_audio_content_detail.xml index 33ac051..bdec50f 100644 --- a/app/src/main/res/layout/activity_audio_content_detail.xml +++ b/app/src/main/res/layout/activity_audio_content_detail.xml @@ -75,7 +75,7 @@ android:layout_alignParentEnd="true" android:contentDescription="@null" android:visibility="gone" - tools:src="@drawable/btn_notification_selected" /> + tools:src="@drawable/btn_following_big" /> @@ -331,27 +331,33 @@ tools:text="오늘 라이브 방송은ㅇㄹ너ㅏㅣㅇㄴ럴ㄴ아ㅣㄴㅇ러ㅏㅣ" /> - - + android:gravity="center_vertical" + android:orientation="horizontal"> - + + + + + + tools:src="@drawable/btn_following_big" />