diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentAdapter.kt index e52ad09..5709488 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentAdapter.kt @@ -40,7 +40,7 @@ class AudioContentAdapter( } else { binding.tvPrice.text = item.price.moneyFormat() binding.tvPrice.setCompoundDrawablesWithIntrinsicBounds( - R.drawable.ic_coin_w, + R.drawable.ic_can, 0, 0, 0 diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentPlayService.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentPlayService.kt index 3c6a25e..b2d3c5e 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentPlayService.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentPlayService.kt @@ -463,7 +463,7 @@ class AudioContentPlayService : override fun onResourceReady(resource: Bitmap, transition: Transition?) { val notificationBuilder = NotificationCompat .Builder(this@AudioContentPlayService, channelId) - .setSmallIcon(R.drawable.ic_noti) + .setSmallIcon(R.drawable.ic_notification) .setLargeIcon(resource) .setContentTitle(title ?: "오디오 콘텐츠") .setContentText(nickname ?: "") diff --git a/app/src/main/java/kr/co/vividnext/sodalive/common/SodaLiveService.kt b/app/src/main/java/kr/co/vividnext/sodalive/common/SodaLiveService.kt index 2242bf8..d3b41a1 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/common/SodaLiveService.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/common/SodaLiveService.kt @@ -62,7 +62,7 @@ class SodaLiveService : Service() { ) val notificationBuilder = NotificationCompat.Builder(this, notificationChannelId) - .setSmallIcon(R.drawable.ic_noti) + .setSmallIcon(R.drawable.ic_notification) .setContentTitle(getString(R.string.app_name)) .setContentText(content) .setOngoing(true) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/fcm/SodaFirebaseMessagingService.kt b/app/src/main/java/kr/co/vividnext/sodalive/fcm/SodaFirebaseMessagingService.kt index 85c762e..0701de6 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/fcm/SodaFirebaseMessagingService.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/fcm/SodaFirebaseMessagingService.kt @@ -75,7 +75,7 @@ class SodaFirebaseMessagingService : FirebaseMessagingService() { ) val notificationBuilder = NotificationCompat.Builder(this, notificationChannelId) - .setSmallIcon(R.mipmap.ic_launcher) + .setSmallIcon(R.drawable.ic_notification) .setContentTitle(messageData["title"]) .setContentText(messageData["message"]) .setSound(defaultSoundUri) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt index ca0b54e..0bf0a67 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt @@ -373,11 +373,6 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl recyclerView.visibility = View.GONE binding.layoutLiveNow.tvAllView.visibility = View.GONE binding.layoutLiveNow.llNoItems.visibility = View.VISIBLE - binding.layoutLiveNow.tvMakeRoom.setOnClickListener { - val intent = Intent(requireContext(), LiveRoomCreateActivity::class.java) - activityResultLauncher.launch(intent) - } - recyclerView.requestLayout() binding.layoutLiveNow.llNoItems.requestLayout() } else { @@ -460,12 +455,6 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl recyclerView.visibility = View.GONE binding.layoutLiveReservation.tvAllView.visibility = View.GONE binding.layoutLiveReservation.llNoItems.visibility = View.VISIBLE - binding.layoutLiveReservation.tvMakeRoom.setOnClickListener { - val intent = Intent(requireContext(), LiveRoomCreateActivity::class.java) - intent.putExtra(Constants.EXTRA_LIVE_TIME_NOW, false) - activityResultLauncher.launch(intent) - } - recyclerView.requestLayout() binding.layoutLiveReservation.llNoItems.requestLayout() } else { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllAdapter.kt index d23761d..f705972 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllAdapter.kt @@ -68,7 +68,7 @@ class LiveNowAllAdapter( binding.tvPrice.setCompoundDrawablesWithIntrinsicBounds( 0, 0, - R.drawable.ic_coin_w, + R.drawable.ic_can, 0 ) } diff --git a/app/src/main/res/drawable-xxhdpi/ic_can.png b/app/src/main/res/drawable-xxhdpi/ic_can.png index ebd2064..7142a77 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_can.png and b/app/src/main/res/drawable-xxhdpi/ic_can.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_donation_status.png b/app/src/main/res/drawable-xxhdpi/ic_donation_status.png deleted file mode 100644 index 1e1dab5..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_donation_status.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_no_item.png b/app/src/main/res/drawable-xxhdpi/ic_no_item.png index 498f40c..9b86d83 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_no_item.png and b/app/src/main/res/drawable-xxhdpi/ic_no_item.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_noti.png b/app/src/main/res/drawable-xxhdpi/ic_noti.png deleted file mode 100644 index e03f3c5..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_noti.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification.png b/app/src/main/res/drawable-xxhdpi/ic_notification.png new file mode 100644 index 0000000..6abc1c5 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_notification.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_place_holder.png b/app/src/main/res/drawable-xxhdpi/ic_place_holder.png new file mode 100644 index 0000000..504b3fb Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_place_holder.png 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 b8fbac3..c93a8f7 100644 --- a/app/src/main/res/layout/activity_audio_content_detail.xml +++ b/app/src/main/res/layout/activity_audio_content_detail.xml @@ -409,7 +409,7 @@ android:layout_width="16.7dp" android:layout_height="16.7dp" android:contentDescription="@null" - android:src="@drawable/ic_coin_w" /> + android:src="@drawable/ic_can" /> diff --git a/app/src/main/res/layout/activity_live_reservation_all.xml b/app/src/main/res/layout/activity_live_reservation_all.xml index 425c7ab..d3105ab 100644 --- a/app/src/main/res/layout/activity_live_reservation_all.xml +++ b/app/src/main/res/layout/activity_live_reservation_all.xml @@ -63,24 +63,9 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="지금 예약중인 라이브가 없습니다.\n직접 라이브를 만들어 보세요!" + android:text="지금 예약중인 라이브가 없습니다.\n채널을 팔로잉 하고 라이브 알림을 받아 보세요." android:textColor="@color/color_bbbbbb" android:textSize="10.7sp" tools:ignore="SmallSp" /> - - diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml index 8b7a6c4..a3de2b3 100644 --- a/app/src/main/res/layout/activity_live_room.xml +++ b/app/src/main/res/layout/activity_live_room.xml @@ -212,7 +212,7 @@ android:layout_width="16dp" android:layout_height="16dp" android:contentDescription="@null" - android:src="@drawable/ic_donation_status" /> + android:src="@drawable/ic_can" /> + tools:src="@drawable/ic_notification" /> + android:src="@drawable/ic_can" /> diff --git a/app/src/main/res/layout/dialog_live_room_password.xml b/app/src/main/res/layout/dialog_live_room_password.xml index aaf04b3..f2d5319 100644 --- a/app/src/main/res/layout/dialog_live_room_password.xml +++ b/app/src/main/res/layout/dialog_live_room_password.xml @@ -121,7 +121,7 @@ android:gravity="center" android:textColor="@color/white" android:textSize="18.3sp" - app:drawableEndCompat="@drawable/ic_coin_w" + app:drawableEndCompat="@drawable/ic_can" tools:text="100" /> + android:src="@drawable/ic_can" /> + android:src="@drawable/ic_can" /> diff --git a/app/src/main/res/layout/item_audio_content.xml b/app/src/main/res/layout/item_audio_content.xml index 055ff14..e8a2ce4 100644 --- a/app/src/main/res/layout/item_audio_content.xml +++ b/app/src/main/res/layout/item_audio_content.xml @@ -151,7 +151,7 @@ android:gravity="center" android:textColor="@color/color_909090" android:textSize="12sp" - app:drawableStartCompat="@drawable/ic_coin_w" + app:drawableStartCompat="@drawable/ic_can" app:layout_constraintBottom_toBottomOf="@+id/iv_cover" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/iv_cover" diff --git a/app/src/main/res/layout/item_audio_content_comment.xml b/app/src/main/res/layout/item_audio_content_comment.xml index fc989c9..570d0ca 100644 --- a/app/src/main/res/layout/item_audio_content_comment.xml +++ b/app/src/main/res/layout/item_audio_content_comment.xml @@ -65,7 +65,7 @@ android:layout_width="13.3dp" android:layout_height="13.3dp" android:contentDescription="@null" - android:src="@drawable/ic_coin_w" /> + android:src="@drawable/ic_can" /> diff --git a/app/src/main/res/layout/layout_live_now.xml b/app/src/main/res/layout/layout_live_now.xml index 4d3f260..7eae7bc 100644 --- a/app/src/main/res/layout/layout_live_now.xml +++ b/app/src/main/res/layout/layout_live_now.xml @@ -76,25 +76,9 @@ android:layout_marginVertical="10dp" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="🙀지금 참여가능한 라이브가 없습니다.\n직접 라이브를 만들어 보세요!" + android:text="🙀지금 참여가능한 라이브가 없습니다.\n채널을 팔로잉 하고 라이브 알림을 받아 보세요." android:textColor="@color/color_bbbbbb" android:textSize="10.7sp" tools:ignore="SmallSp" /> - - - diff --git a/app/src/main/res/layout/layout_live_reservation.xml b/app/src/main/res/layout/layout_live_reservation.xml index 88ab43d..64344d8 100644 --- a/app/src/main/res/layout/layout_live_reservation.xml +++ b/app/src/main/res/layout/layout_live_reservation.xml @@ -1,6 +1,5 @@ - - -