From 1ec0d8540aa59fdd0a272399f8ef3b930d08bcde Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Wed, 14 Feb 2024 18:19:47 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A6=AC?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=95=84=EC=9D=B4=ED=85=9C=20-=20?=
 =?UTF-8?q?=EC=82=AC=EC=9D=B4=EC=A6=88,=20=EA=B0=84=EA=B2=A9=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../all/AudioContentNewAllActivity.kt         | 10 ++++-----
 .../all/AudioContentNewAllAdapter.kt          |  3 ++-
 .../AudioContentAllByThemeActivity.kt         | 10 ++++-----
 .../curation/AudioContentCurationActivity.kt  | 10 ++++-----
 .../res/layout/item_audio_content_new_all.xml | 22 ++++++-------------
 5 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt
index 0d8f135..269b03f 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt
@@ -90,7 +90,7 @@ class AudioContentNewAllActivity : BaseActivity<ActivityAudioContentNewAllBindin
 
     private fun setupNewContent() {
         newContentAdapter = AudioContentNewAllAdapter(
-            itemWidth = (screenWidth - 54f.dpToPx().toInt()) / 3,
+            itemWidth = (screenWidth - 42f.dpToPx().toInt()) / 3,
             onClickItem = {
                 startActivity(
                     Intent(this, AudioContentDetailActivity::class.java).apply {
@@ -118,10 +118,10 @@ class AudioContentNewAllActivity : BaseActivity<ActivityAudioContentNewAllBindin
             ) {
                 super.getItemOffsets(outRect, view, parent, state)
 
-                outRect.top = 6.7f.dpToPx().toInt()
-                outRect.bottom = 6.7f.dpToPx().toInt()
-                outRect.left = 6.7f.dpToPx().toInt()
-                outRect.right = 6.7f.dpToPx().toInt()
+                outRect.top = 8f.dpToPx().toInt()
+                outRect.bottom = 8f.dpToPx().toInt()
+                outRect.left = 4f.dpToPx().toInt()
+                outRect.right = 4f.dpToPx().toInt()
             }
         })
 
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllAdapter.kt
index 001ca63..b5b8012 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllAdapter.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllAdapter.kt
@@ -14,6 +14,7 @@ import kr.co.vividnext.sodalive.R
 import kr.co.vividnext.sodalive.audio_content.main.GetAudioContentMainItem
 import kr.co.vividnext.sodalive.databinding.ItemAudioContentNewAllBinding
 import kr.co.vividnext.sodalive.extensions.dpToPx
+import kr.co.vividnext.sodalive.extensions.moneyFormat
 
 class AudioContentNewAllAdapter(
     private val itemWidth: Int,
@@ -52,7 +53,7 @@ class AudioContentNewAllAdapter(
 
             if (item.price > 0) {
                 binding.ivCan.visibility = View.VISIBLE
-                binding.tvCan.text = "${item.price}"
+                binding.tvCan.text = item.price.moneyFormat()
             } else {
                 binding.ivCan.visibility = View.GONE
                 binding.tvCan.text = "무료"
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/AudioContentAllByThemeActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/AudioContentAllByThemeActivity.kt
index 4b284a0..a5dad8f 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/AudioContentAllByThemeActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/AudioContentAllByThemeActivity.kt
@@ -56,7 +56,7 @@ class AudioContentAllByThemeActivity : BaseActivity<ActivityAudioContentAllByThe
         binding.toolbar.tvBack.setOnClickListener { finish() }
 
         adapter = AudioContentNewAllAdapter(
-            itemWidth = (screenWidth - 54f.dpToPx().toInt()) / 3,
+            itemWidth = (screenWidth - 42f.dpToPx().toInt()) / 3,
             onClickItem = {
                 startActivity(
                     Intent(this, AudioContentDetailActivity::class.java).apply {
@@ -84,10 +84,10 @@ class AudioContentAllByThemeActivity : BaseActivity<ActivityAudioContentAllByThe
             ) {
                 super.getItemOffsets(outRect, view, parent, state)
 
-                outRect.top = 6.7f.dpToPx().toInt()
-                outRect.bottom = 6.7f.dpToPx().toInt()
-                outRect.left = 6.7f.dpToPx().toInt()
-                outRect.right = 6.7f.dpToPx().toInt()
+                outRect.top = 8f.dpToPx().toInt()
+                outRect.bottom = 8f.dpToPx().toInt()
+                outRect.left = 4f.dpToPx().toInt()
+                outRect.right = 4f.dpToPx().toInt()
             }
         })
 
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/curation/AudioContentCurationActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/curation/AudioContentCurationActivity.kt
index 5662e99..0fe7cf8 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/curation/AudioContentCurationActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/curation/AudioContentCurationActivity.kt
@@ -55,7 +55,7 @@ class AudioContentCurationActivity : BaseActivity<ActivityAudioContentCurationBi
         binding.toolbar.tvBack.setOnClickListener { finish() }
 
         adapter = AudioContentNewAllAdapter(
-            itemWidth = (screenWidth - 54f.dpToPx().toInt()) / 3,
+            itemWidth = (screenWidth - 42f.dpToPx().toInt()) / 3,
             onClickItem = {
                 startActivity(
                     Intent(this, AudioContentDetailActivity::class.java).apply {
@@ -83,10 +83,10 @@ class AudioContentCurationActivity : BaseActivity<ActivityAudioContentCurationBi
             ) {
                 super.getItemOffsets(outRect, view, parent, state)
 
-                outRect.top = 6.7f.dpToPx().toInt()
-                outRect.bottom = 6.7f.dpToPx().toInt()
-                outRect.left = 6.7f.dpToPx().toInt()
-                outRect.right = 6.7f.dpToPx().toInt()
+                outRect.top = 8f.dpToPx().toInt()
+                outRect.bottom = 8f.dpToPx().toInt()
+                outRect.left = 4f.dpToPx().toInt()
+                outRect.right = 4f.dpToPx().toInt()
             }
         })
 
diff --git a/app/src/main/res/layout/item_audio_content_new_all.xml b/app/src/main/res/layout/item_audio_content_new_all.xml
index 4c5af8b..a531f06 100644
--- a/app/src/main/res/layout/item_audio_content_new_all.xml
+++ b/app/src/main/res/layout/item_audio_content_new_all.xml
@@ -20,7 +20,7 @@
         android:layout_marginBottom="2.7dp"
         android:background="@drawable/bg_round_corner_10_b3333333"
         android:orientation="horizontal"
-        android:padding="3dp"
+        android:padding="4dp"
         android:gravity="center"
         app:layout_constraintBottom_toBottomOf="@+id/iv_audio_content_cover_image"
         app:layout_constraintStart_toStartOf="@+id/iv_audio_content_cover_image">
@@ -30,18 +30,18 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="@null"
+            android:layout_marginEnd="2dp"
             android:src="@drawable/ic_card_can_gray" />
 
         <TextView
             android:id="@+id/tv_can"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
             android:fontFamily="@font/gmarket_sans_medium"
             android:textColor="@color/white"
-            android:textSize="8.3sp"
+            android:textSize="8.5sp"
             tools:ignore="SmallSp"
-            tools:text="300" />
+            tools:text="100000" />
     </LinearLayout>
 
     <LinearLayout
@@ -52,25 +52,17 @@
         android:background="@drawable/bg_round_corner_10_b3333333"
         android:orientation="horizontal"
         android:gravity="center"
-        android:padding="3dp"
+        android:padding="4dp"
         app:layout_constraintBottom_toBottomOf="@+id/iv_audio_content_cover_image"
         app:layout_constraintEnd_toEndOf="@+id/iv_audio_content_cover_image">
 
-        <ImageView
-            android:id="@+id/iv_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@null"
-            android:src="@drawable/ic_card_time_small_gray" />
-
         <TextView
             android:id="@+id/tv_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
             android:fontFamily="@font/gmarket_sans_medium"
             android:textColor="@color/white"
-            android:textSize="8.3sp"
+            android:textSize="8.5sp"
             tools:ignore="SmallSp"
             tools:text="00:00:30" />
     </LinearLayout>
@@ -82,7 +74,7 @@
         android:layout_marginTop="8dp"
         android:ellipsize="end"
         android:fontFamily="@font/gmarket_sans_medium"
-        android:maxLines="1"
+        android:maxLines="2"
         android:textColor="@color/color_d2d2d2"
         android:textSize="13.3sp"
         app:layout_constraintEnd_toEndOf="@+id/iv_audio_content_cover_image"