라이브

- 팔로우/팔로잉 버튼 변경

app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt

@@ -769,7 +769,7 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
             binding.ivFollow.visibility = View.VISIBLE
 
             if (creator.isFollowing) {
-                binding.ivFollow.setImageResource(R.drawable.btn_notification_selected)
+                binding.ivFollow.setImageResource(R.drawable.btn_following_big)
                 binding.ivFollow.setOnClickListener {
                     viewModel.unRegisterNotification(
                         contentId = audioContentId,
@@ -777,7 +777,7 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
                     )
                 }
             } else {
-                binding.ivFollow.setImageResource(R.drawable.btn_notification)
+                binding.ivFollow.setImageResource(R.drawable.btn_follow_big)
                 binding.ivFollow.setOnClickListener {
                     viewModel.registerNotification(
                         contentId = audioContentId,

app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileActivity.kt

@@ -615,12 +615,12 @@ class UserProfileActivity : BaseActivity<ActivityUserProfileBinding>(
         }
 
         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)
             }

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()

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)

app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt

@@ -800,7 +800,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(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<ActivityLiveRoomBinding>(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,

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" />
     </RelativeLayout>
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout

app/src/main/res/layout/activity_live_room.xml

@@ -294,9 +294,9 @@
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
                     android:layout_marginHorizontal="5.3dp"
-                    android:layout_toStartOf="@+id/iv_creator_follow"
                     android:layout_toEndOf="@+id/rl_creator_profile"
                     android:orientation="vertical">
 
@@ -331,27 +331,33 @@
                             tools:text="오늘 라이브 방송은ㅇㄹ너ㅏㅣㅇㄴ럴ㄴ아ㅣㄴㅇ러ㅏㅣ" />
                     </LinearLayout>
 
-                    <TextView
+                    <LinearLayout
-                        android:id="@+id/tv_creator_nickname"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="2.7dp"
+                        android:gravity="center_vertical"
-                        android:ellipsize="end"
+                        android:orientation="horizontal">
-                        android:fontFamily="@font/gmarket_sans_medium"
-                        android:lines="1"
-                        android:textColor="@color/color_777777"
-                        android:textSize="12sp"
-                        tools:text="청령" />
-                </LinearLayout>
 
-                <ImageView
+                        <TextView
-                    android:id="@+id/iv_creator_follow"
+                            android:id="@+id/tv_creator_nickname"
-                    android:layout_width="wrap_content"
+                            android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                            android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                            android:layout_marginTop="2.7dp"
-                    android:layout_centerVertical="true"
+                            android:ellipsize="end"
-                    android:contentDescription="@null"
+                            android:fontFamily="@font/gmarket_sans_medium"
-                    android:src="@drawable/btn_plus_round" />
+                            android:lines="1"
+                            android:textColor="@color/color_777777"
+                            android:textSize="12sp"
+                            tools:text="청령" />
+
+                        <ImageView
+                            android:id="@+id/iv_creator_follow"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="5.3dp"
+                            android:contentDescription="@null"
+                            android:src="@drawable/btn_follow" />
+                    </LinearLayout>
+                </LinearLayout>
             </RelativeLayout>
 
             <androidx.recyclerview.widget.RecyclerView

app/src/main/res/layout/layout_user_profile.xml

@@ -89,7 +89,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
-                tools:src="@drawable/btn_notification_selected" />
+                tools:src="@drawable/btn_following_big" />
 
             <TextView
                 android:id="@+id/tv_notification_count"