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

라이브 메인 

- 당겨서 새로고침 제거
- 새로고침 버튼 추가
This commit is contained in:
klaus 2024-05-07 19:02:58 +09:00
parent 8c6aff1623
commit 3c82ff1c4e
3 changed files with 76 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,8 +129,6 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::infl
val intent = Intent(requireContext(), LiveRoomCreateActivity::class.java) val intent = Intent(requireContext(), LiveRoomCreateActivity::class.java)
activityResultLauncher.launch(intent) activityResultLauncher.launch(intent)
} }
binding.swipeRefreshLayout.setOnRefreshListener { refreshSummary() }
} }
private fun refreshSummary() { private fun refreshSummary() {
@ -140,8 +138,6 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::infl
message = "라이브를 불러오고 있습니다." message = "라이브를 불러오고 있습니다."
viewModel.getSummary() viewModel.getSummary()
binding.swipeRefreshLayout.isRefreshing = false
} }
@SuppressLint("NotifyDataSetChanged") @SuppressLint("NotifyDataSetChanged")
@ -287,6 +283,11 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::infl
startActivity(Intent(requireContext(), LiveNowAllActivity::class.java)) startActivity(Intent(requireContext(), LiveNowAllActivity::class.java))
} }
binding
.layoutLiveNow
.llRefresh
.setOnClickListener { refreshSummary() }
val recyclerView = binding val recyclerView = binding
.layoutLiveNow .layoutLiveNow
.rvSudaNow .rvSudaNow

98
app/src/main/res/layout/fragment_live.xml
View File

@ -4,71 +4,65 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout <androidx.core.widget.NestedScrollView
android:id="@+id/swipe_refresh_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.core.widget.NestedScrollView <LinearLayout
android:layout_width="match_parent" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:layout_marginHorizontal="13.3dp"
android:layout_marginTop="13.3dp"
android:layout_marginBottom="40dp" />
<include <include
android:id="@+id/layout_recommend_live" android:id="@+id/layout_recommend_channel"
layout="@layout/layout_recommend_live" layout="@layout/layout_live_recommend_channel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="13.3dp" android:layout_marginHorizontal="13.3dp" />
android:layout_marginTop="13.3dp"
android:layout_marginBottom="40dp" />
<include <include
android:id="@+id/layout_recommend_channel" android:id="@+id/layout_live_now"
layout="@layout/layout_live_recommend_channel" layout="@layout/layout_live_now"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="13.3dp" /> android:layout_marginTop="40dp" />
<include <com.zhpan.bannerview.BannerViewPager
android:id="@+id/layout_live_now" android:id="@+id/event_banner_slider"
layout="@layout/layout_live_now" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginTop="40dp" />
android:layout_marginTop="40dp" />
<com.zhpan.bannerview.BannerViewPager <com.zhpan.indicator.IndicatorView
android:id="@+id/event_banner_slider" android:id="@+id/indicator"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="40dp" /> android:layout_gravity="center"
android:layout_marginTop="6.7dp" />
<com.zhpan.indicator.IndicatorView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/indicator" android:id="@+id/rv_community_post"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_marginTop="40dp" />
android:layout_marginTop="6.7dp" />
<androidx.recyclerview.widget.RecyclerView <include
android:id="@+id/rv_community_post" android:id="@+id/layout_live_reservation"
android:layout_width="match_parent" layout="@layout/layout_live_reservation"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginTop="40dp" /> android:layout_height="wrap_content"
android:layout_marginTop="40dp" />
<include </LinearLayout>
android:id="@+id/layout_live_reservation" </androidx.core.widget.NestedScrollView>
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>
<ImageView <ImageView
android:id="@+id/iv_make_room" android:id="@+id/iv_make_room"

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

@ -80,4 +80,29 @@
android:textSize="10.7sp" android:textSize="10.7sp"
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
</LinearLayout> </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> </LinearLayout>