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

---
 .../vividnext/sodalive/live/LiveFragment.kt   |  9 +-
 app/src/main/res/layout/fragment_live.xml     | 98 +++++++++----------
 app/src/main/res/layout/layout_live_now.xml   | 25 +++++
 3 files changed, 76 insertions(+), 56 deletions(-)

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 c4cd4c76..a8194a2d 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
@@ -129,8 +129,6 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::infl
             val intent = Intent(requireContext(), LiveRoomCreateActivity::class.java)
             activityResultLauncher.launch(intent)
         }
-
-        binding.swipeRefreshLayout.setOnRefreshListener { refreshSummary() }
     }
 
     private fun refreshSummary() {
@@ -140,8 +138,6 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::infl
 
         message = "라이브를 불러오고 있습니다."
         viewModel.getSummary()
-
-        binding.swipeRefreshLayout.isRefreshing = false
     }
 
     @SuppressLint("NotifyDataSetChanged")
@@ -287,6 +283,11 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::infl
                 startActivity(Intent(requireContext(), LiveNowAllActivity::class.java))
             }
 
+        binding
+            .layoutLiveNow
+            .llRefresh
+            .setOnClickListener { refreshSummary() }
+
         val recyclerView = binding
             .layoutLiveNow
             .rvSudaNow
diff --git a/app/src/main/res/layout/fragment_live.xml b/app/src/main/res/layout/fragment_live.xml
index c3f89854..3210fe24 100644
--- a/app/src/main/res/layout/fragment_live.xml
+++ b/app/src/main/res/layout/fragment_live.xml
@@ -4,71 +4,65 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/swipe_refresh_layout"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.core.widget.NestedScrollView
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-            <LinearLayout
+            <include
+                android:id="@+id/layout_recommend_live"
+                layout="@layout/layout_recommend_live"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_marginHorizontal="13.3dp"
+                android:layout_marginTop="13.3dp"
+                android:layout_marginBottom="40dp" />
 
-                <include
-                    android:id="@+id/layout_recommend_live"
-                    layout="@layout/layout_recommend_live"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="13.3dp"
-                    android:layout_marginTop="13.3dp"
-                    android:layout_marginBottom="40dp" />
+            <include
+                android:id="@+id/layout_recommend_channel"
+                layout="@layout/layout_live_recommend_channel"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="13.3dp" />
 
-                <include
-                    android:id="@+id/layout_recommend_channel"
-                    layout="@layout/layout_live_recommend_channel"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="13.3dp" />
+            <include
+                android:id="@+id/layout_live_now"
+                layout="@layout/layout_live_now"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="40dp" />
 
-                <include
-                    android:id="@+id/layout_live_now"
-                    layout="@layout/layout_live_now"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="40dp" />
+            <com.zhpan.bannerview.BannerViewPager
+                android:id="@+id/event_banner_slider"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="40dp" />
 
-                <com.zhpan.bannerview.BannerViewPager
-                    android:id="@+id/event_banner_slider"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="40dp" />
+            <com.zhpan.indicator.IndicatorView
+                android:id="@+id/indicator"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="6.7dp" />
 
-                <com.zhpan.indicator.IndicatorView
-                    android:id="@+id/indicator"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="6.7dp" />
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_community_post"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="40dp" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rv_community_post"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="40dp" />
-
-                <include
-                    android:id="@+id/layout_live_reservation"
-                    layout="@layout/layout_live_reservation"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="40dp" />
-            </LinearLayout>
-        </androidx.core.widget.NestedScrollView>
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+            <include
+                android:id="@+id/layout_live_reservation"
+                layout="@layout/layout_live_reservation"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="40dp" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 
     <ImageView
         android:id="@+id/iv_make_room"
diff --git a/app/src/main/res/layout/layout_live_now.xml b/app/src/main/res/layout/layout_live_now.xml
index 49b51351..4fd44727 100644
--- a/app/src/main/res/layout/layout_live_now.xml
+++ b/app/src/main/res/layout/layout_live_now.xml
@@ -80,4 +80,29 @@
             android:textSize="10.7sp"
             tools:ignore="SmallSp" />
     </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_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>