klaus
/
sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

캔 아이콘 변경

This commit is contained in:
klaus 2023-08-17 23:41:16 +09:00
parent 7aaac27d24
commit e165813545
27 changed files with 23 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentAdapter.kt
View File

@ -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

2
app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentPlayService.kt
View File

@ -463,7 +463,7 @@ class AudioContentPlayService :
override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
val notificationBuilder = NotificationCompat
.Builder(this@AudioContentPlayService, channelId)
.setSmallIcon(R.drawable.ic_noti)
.setSmallIcon(R.drawable.ic_notification)
.setLargeIcon(resource)
.setContentTitle(title ?: "오디오 콘텐츠")
.setContentText(nickname ?: "")

2
app/src/main/java/kr/co/vividnext/sodalive/common/SodaLiveService.kt
View File

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

2
app/src/main/java/kr/co/vividnext/sodalive/fcm/SodaFirebaseMessagingService.kt
View File

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

11
app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt
View File

@ -373,11 +373,6 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(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>(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 {

2
app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllAdapter.kt
View File

@ -68,7 +68,7 @@ class LiveNowAllAdapter(
binding.tvPrice.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.ic_coin_w,
R.drawable.ic_can,
0
)
}

BIN
app/src/main/res/drawable-xxhdpi/ic_can.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_donation_status.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.7 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_no_item.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_noti.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.2 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_notification.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_place_holder.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 70 KiB

2
app/src/main/res/layout/activity_audio_content_detail.xml
View File

@ -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" />
<TextView
android:id="@+id/tv_price"

2
app/src/main/res/layout/activity_live_now_all.xml
View File

@ -28,7 +28,7 @@
android:layout_gravity="center"
android:layout_marginTop="28.3dp"
android:fontFamily="@font/gmarket_sans_medium"
android:text="지금 참여 가능한 라이브가 없습니다."
android:text="지금 참여 가능한 라이브가 없습니다.\n채널을 팔로잉 하고 라이브 알림을 받아 보세요."
android:textColor="@color/color_bbbbbb"
android:textSize="15sp"
android:visibility="gone" />

17
app/src/main/res/layout/activity_live_reservation_all.xml
View File

@ -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" />
<TextView
android:id="@+id/tv_make_room"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_round_corner_4_7_9970ff"
android:drawablePadding="8.3dp"
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center"
android:paddingHorizontal="51.7dp"
android:paddingVertical="8.3dp"
android:text="라이브 만들기"
android:textColor="@color/white"
android:textSize="13.3sp"
app:drawableStartCompat="@drawable/ic_plus_no_bg" />
</LinearLayout>
</LinearLayout>

2
app/src/main/res/layout/activity_live_room.xml
View File

@ -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" />
<TextView
android:id="@+id/tv_total_can"

2
app/src/main/res/layout/activity_main.xml
View File

@ -28,7 +28,7 @@
android:layout_height="36.7dp"
android:layout_centerVertical="true"
android:contentDescription="@null"
tools:src="@drawable/ic_noti" />
tools:src="@drawable/ic_notification" />
<LinearLayout
android:layout_width="0dp"

2
app/src/main/res/layout/dialog_audio_content_order_confirm.xml
View File

@ -145,7 +145,7 @@
android:layout_height="16.7dp"
android:layout_marginEnd="2.7dp"
android:contentDescription="@null"
android:src="@drawable/ic_coin_w" />
android:src="@drawable/ic_can" />
<TextView
android:id="@+id/tv_price"

2
app/src/main/res/layout/dialog_live_room_donation.xml
View File

@ -38,7 +38,7 @@
android:textColor="@color/color_eeeeee"
android:textSize="16sp"
app:drawableEndCompat="@drawable/ic_forward"
app:drawableStartCompat="@drawable/ic_coin_w"
app:drawableStartCompat="@drawable/ic_can"
tools:ignore="RelativeOverlap"
tools:text="0" />
</RelativeLayout>

2
app/src/main/res/layout/dialog_live_room_password.xml
View File

@ -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" />
<TextView

4
app/src/main/res/layout/fragment_audio_content_order.xml
View File

@ -50,7 +50,7 @@
android:layout_height="16.7dp"
android:layout_marginEnd="2.7dp"
android:contentDescription="@null"
android:src="@drawable/ic_coin_w" />
android:src="@drawable/ic_can" />
<TextView
android:id="@+id/tv_rental"
@ -107,7 +107,7 @@
android:layout_height="16.7dp"
android:layout_marginEnd="2.7dp"
android:contentDescription="@null"
android:src="@drawable/ic_coin_w" />
android:src="@drawable/ic_can" />
<TextView
android:id="@+id/tv_keep"

2
app/src/main/res/layout/fragment_live_room_detail.xml
View File

@ -68,7 +68,7 @@
android:gravity="center"
android:textColor="@color/color_eeeeee"
android:textSize="15.3sp"
app:drawableEndCompat="@drawable/ic_coin_w"
app:drawableEndCompat="@drawable/ic_can"
tools:ignore="RelativeOverlap"
tools:text="300" />

2
app/src/main/res/layout/item_audio_content.xml
View File

@ -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"

2
app/src/main/res/layout/item_audio_content_comment.xml
View File

@ -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" />
<TextView
android:id="@+id/tv_donation_can"

6
app/src/main/res/layout/item_live_room_chat.xml
View File

@ -29,7 +29,7 @@
android:layout_height="16.7dp"
android:layout_gravity="end|bottom"
android:contentDescription="@null"
android:src="@drawable/ic_coin_w"
android:src="@drawable/ic_can"
android:visibility="gone" />
<ImageView
@ -61,11 +61,11 @@
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:fontFamily="@font/gmarket_sans_medium"
android:gravity="center"
android:padding="2dp"
android:textColor="@color/white"
android:visibility="gone"
android:gravity="center"
android:textSize="10sp"
android:visibility="gone"
tools:background="@drawable/bg_round_corner_2_4999e3"
tools:ignore="SmallSp"
tools:text="스탭" />

18
app/src/main/res/layout/layout_live_now.xml
View File

@ -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" />
<TextView
android:id="@+id/tv_make_room"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_round_corner_4_7_9970ff"
android:drawablePadding="8.3dp"
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center"
android:paddingHorizontal="51.7dp"
android:paddingVertical="8.3dp"
android:text="라이브 만들기"
android:textColor="@color/white"
android:textSize="13.3sp"
app:drawableStartCompat="@drawable/ic_plus_no_bg" />
</LinearLayout>
</LinearLayout>

19
app/src/main/res/layout/layout_live_reservation.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -77,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" />
<TextView
android:id="@+id/tv_make_room"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_round_corner_4_7_9970ff"
android:drawablePadding="8.3dp"
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center"
android:paddingHorizontal="51.7dp"
android:paddingVertical="8.3dp"
android:text="라이브 만들기"
android:textColor="@color/white"
android:textSize="13.3sp"
app:drawableStartCompat="@drawable/ic_plus_no_bg" />
</LinearLayout>
</LinearLayout>