From 8c6aff16237d7f112c69b525a3a296f3fc0e7400 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Tue, 7 May 2024 18:58:15 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?=
 =?UTF-8?q?=EC=9D=B8=20-=20=EC=B6=94=EC=B2=9C=20=EC=8B=9C=EB=A6=AC?=
 =?UTF-8?q?=EC=A6=88,=20=EC=83=88=EB=A1=9C=EC=9A=B4=20=EC=BD=98=ED=85=90?=
 =?UTF-8?q?=EC=B8=A0=20-=20=EC=83=88=EB=A1=9C=EA=B3=A0=EC=B9=A8=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/AudioContentMainFragment.kt          |  11 +++-
 .../AudioContentMainNewContentViewModel.kt    |   4 ++
 .../main/res/drawable-xxhdpi/ic_refresh.png   | Bin 0 -> 886 bytes
 ...g_round_corner_26_7_transparent_909090.xml |   8 +++
 .../layout/fragment_audio_content_main.xml    |  50 ++++++++++++++++++
 5 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_refresh.png
 create mode 100644 app/src/main/res/drawable/bg_round_corner_26_7_transparent_909090.xml

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt
index d1d3bf8..a110922 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt
@@ -12,7 +12,6 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.orhanobut.logger.Logger
 import com.zhpan.bannerview.BaseBannerAdapter
 import com.zhpan.indicator.enums.IndicatorSlideMode
 import com.zhpan.indicator.enums.IndicatorStyle
@@ -194,6 +193,11 @@ class AudioContentMainFragment : BaseFragment<FragmentAudioContentMainBinding>(
         recommendSeriesViewModel.toastLiveData.observe(viewLifecycleOwner) {
             it?.let { Toast.makeText(requireContext(), it, Toast.LENGTH_LONG).show() }
         }
+
+        binding.llRecommendSeriesRefresh.setOnClickListener {
+            seriesAdapter.clear()
+            recommendSeriesViewModel.getRecommendSeriesList()
+        }
     }
 
     private fun setupBanner() {
@@ -468,6 +472,11 @@ class AudioContentMainFragment : BaseFragment<FragmentAudioContentMainBinding>(
         newContentViewModel.toastLiveData.observe(viewLifecycleOwner) {
             it?.let { Toast.makeText(requireContext(), it, Toast.LENGTH_LONG).show() }
         }
+
+        binding.llNewContentRefresh.setOnClickListener {
+            newContentViewModel.getThemeList()
+            newContentViewModel.getNewContentOfTheme("전체")
+        }
     }
 
     private fun setupContentRankingSortType() {
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/new_content/AudioContentMainNewContentViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/new_content/AudioContentMainNewContentViewModel.kt
index f3daa8b..48d46cb 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/new_content/AudioContentMainNewContentViewModel.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/new_content/AudioContentMainNewContentViewModel.kt
@@ -61,6 +61,7 @@ class AudioContentMainNewContentViewModel(
     }
 
     fun getNewContentOfTheme(theme: String) {
+        _isLoading.value = true
         compositeDisposable.add(
             repository.getNewContentOfTheme(
                 theme = if (theme == "전체") {
@@ -85,10 +86,13 @@ class AudioContentMainNewContentViewModel(
                                 )
                             }
                         }
+
+                        _isLoading.value = false
                     },
                     {
                         it.message?.let { message -> Logger.e(message) }
                         _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
+                        _isLoading.value = false
                     }
                 )
         )
diff --git a/app/src/main/res/drawable-xxhdpi/ic_refresh.png b/app/src/main/res/drawable-xxhdpi/ic_refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..116c9c5eb5e2aefab98b3c42a676811b2004f4cf
GIT binary patch
literal 886
zcmV-+1Bv{JP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0}Dw+K~#7F?V5pg
z+aM5z&z-;<lnt5@v_Z2$yg}0m>`q{3fjS+b6Oc^MY#?_6XM+5NLf&%_0_4DvM11ev
z^OJ=I_Ztp$K-6e78jVI{t}KWd0890uO*pq67mLLMF;iRs>+qGb3uPS*9d~)KcBkxK
ziE^O#h;qDBCh>aq`dL&H>x^#5RYKWIWj*rKEBi{^s7i&?kWHYRO!MWxGt#j>@wa<j
z7jdB~Te%JJl=-IY7-+Oqwt?wM%RpUATV@v#MBlq44q^hR>ovmvR!3)I#kdVTe@&$c
z31A)cA(640!VIsziU?x@!2i$dVQ@`_fEh--BKQOtalTh}L4|>tWqk1_IzydXp(}tK
zab6G;T4;|5$0BX;2mqFf<L&A^ZIP6l1Oa%aBY)ejJ?+Um6e0rbs4^H1N!=rtl#7HO
zFvgY`fSDrQc#u33eWG&c?%7dc?Azjv^L6q&Ly7<gdi%ITvCAqx%-Vb^tnmTESWrDa
zv4UZ&`a^R9=1tNiIvbP>f~=@u_(;QeC1St(FalWao$JpuC-8E4+@r!0y*hSbv_j_9
z;L<)+(A>Z<8`IGTA|(jwB!@V;E|Yku#5qghj^@O<3yk+dv<KJ)hP!E5EeVpF)P<0{
zz+jC7s>f|HoqYKS`15Zp!(gQDRJz#nlX`#}26tq(t4}GG|Idhs6`1la@Y}i8`+<TA
zW5vIr+Q7^PZtg9A8hU!WLh)fmIe|YxT5TvGp0Hg}Zs6Y;>WCTmv%xF^_$t=d#rFlB
zHuN5c<x~MCCq!%-`n&VBo)RTTPq0Gk*dv@<Ka~9?E>K~s8sjHXHunDQ)E@BK291f(
zBmV&jIa1g5q#UmRw$d>XG<%diBC~PI^9x`rjvbBD_jX7>B(+BP#M#m3Tr~k~<pSY<
z%N0c8ykl~@tQcv7?u}2j+!Jb~@KE-kWb`#0W^wcrZ{&1oYL5sZOFF}GSXz)tqiOp>
zCdU}!K<3R;Ct-fsgiJBmkIQRd7Bg-zJdimuU)147qtR$I8jWZE0m-~3KryIV?*IS*
M07*qoM6N<$f_QI{Q2+n{

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/bg_round_corner_26_7_transparent_909090.xml b/app/src/main/res/drawable/bg_round_corner_26_7_transparent_909090.xml
new file mode 100644
index 0000000..1e8277d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_round_corner_26_7_transparent_909090.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@android:color/transparent" />
+    <corners android:radius="26.7dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/color_909090" />
+</shape>
diff --git a/app/src/main/res/layout/fragment_audio_content_main.xml b/app/src/main/res/layout/fragment_audio_content_main.xml
index c5fda03..83b7587 100644
--- a/app/src/main/res/layout/fragment_audio_content_main.xml
+++ b/app/src/main/res/layout/fragment_audio_content_main.xml
@@ -50,6 +50,31 @@
                     android:layout_marginTop="13.3dp"
                     android:clipToPadding="false"
                     android:paddingHorizontal="13.3dp" />
+
+                <LinearLayout
+                    android:id="@+id/ll_recommend_series_refresh"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="13.3dp"
+                    android:layout_marginHorizontal="13.3dp"
+                    android:background="@drawable/bg_round_corner_26_7_transparent_909090"
+                    android:gravity="center"
+                    android:paddingVertical="11dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@null"
+                        android:src="@drawable/ic_refresh" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:fontFamily="@font/gmarket_sans_medium"
+                        android:text="새로고침"
+                        android:textSize="14.7sp" />
+                </LinearLayout>
             </LinearLayout>
 
             <com.zhpan.bannerview.BannerViewPager
@@ -202,6 +227,31 @@
                     android:layout_marginTop="13.3dp"
                     android:clipToPadding="false"
                     android:paddingHorizontal="13.3dp" />
+
+                <LinearLayout
+                    android:id="@+id/ll_new_content_refresh"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="13.3dp"
+                    android:layout_marginHorizontal="13.3dp"
+                    android:background="@drawable/bg_round_corner_26_7_transparent_909090"
+                    android:gravity="center"
+                    android:paddingVertical="11dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@null"
+                        android:src="@drawable/ic_refresh" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:fontFamily="@font/gmarket_sans_medium"
+                        android:text="새로고침"
+                        android:textSize="14.7sp" />
+                </LinearLayout>
             </LinearLayout>
 
             <ProgressBar