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 a75fd55d..0bedfa97 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 @@ -716,17 +716,23 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB isCreatorFollowNotifyEnabled = true } - binding.ivCreatorFollow.setImageResource( - if (response.isFollowing) { - if (isCreatorFollowNotifyEnabled) { - R.drawable.btn_following_big - } else { - R.drawable.btn_following_no_alarm_big - } + val followTextRes = if (response.isFollowing) { + R.string.screen_home_following + } else { + R.string.screen_home_follow + } + val followIconRes = if (response.isFollowing) { + if (isCreatorFollowNotifyEnabled) { + R.drawable.ic_live_creator_follow_alarm } else { - R.drawable.btn_follow_big + R.drawable.ic_live_creator_follow_no_alarm } - ) + } else { + R.drawable.ic_live_creator_follow_plus + } + + binding.tvCreatorFollow.text = getString(followTextRes) + binding.ivCreatorFollowIcon.setImageResource(followIconRes) binding.ivCreatorFollow.setOnClickListener { if (response.isFollowing) { diff --git a/app/src/main/res/drawable-xhdpi/ic_live_creator_follow_alarm.png b/app/src/main/res/drawable-xhdpi/ic_live_creator_follow_alarm.png new file mode 100644 index 00000000..97ef001c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_live_creator_follow_alarm.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_live_creator_follow_no_alarm.png b/app/src/main/res/drawable-xhdpi/ic_live_creator_follow_no_alarm.png new file mode 100644 index 00000000..e2cc235e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_live_creator_follow_no_alarm.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_live_creator_follow_plus.png b/app/src/main/res/drawable-xhdpi/ic_live_creator_follow_plus.png new file mode 100644 index 00000000..b6578785 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_live_creator_follow_plus.png differ diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml index bff2a110..05b3dd70 100644 --- a/app/src/main/res/layout/activity_live_room.xml +++ b/app/src/main/res/layout/activity_live_room.xml @@ -526,14 +526,38 @@ tools:text="999,999" /> - + tools:ignore="RelativeOverlap"> + + + + + `BUILD SUCCESSFUL` + - `./gradlew :app:ktlintCheck` -> `:app:ktlintMainSourceSetCheck FAILED` (기존 `LiveRoomActivity.kt` 다수 스타일 위반으로 실패, 이번 변경 라인 외 기존 누적 이슈) + - `lsp_diagnostics` -> `.kt`/`.xml` 확장자용 LSP 서버 미구성으로 실행 불가 + +### 2026-03-05 15:20 (KST) - 추가 요청 반영 +- 무엇/왜/어떻게: 팔로우 버튼을 하트/후원 캔 버튼과 동일한 표시 방식으로 맞추기 위해 `TextView` 단일 구조를 `LinearLayout(아이콘+텍스트)` 구조로 변경하고, 내부 아이콘 `iv_creator_follow_icon` 크기를 `14dp x 14dp`로 고정했다. +- 수정 파일: + - `app/src/main/res/layout/activity_live_room.xml` + - `app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt` +- 실행 명령 및 결과: + - `./gradlew :app:testDebugUnitTest :app:assembleDebug` -> `BUILD SUCCESSFUL` + - `lsp_diagnostics` -> `.kt`/`.xml` 확장자용 LSP 서버 미구성으로 실행 불가