diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt index 8202712e..ab63a0a3 100644 --- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt +++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt @@ -144,11 +144,8 @@ class WineyFeedFragment : } private fun refreshWineyFeed() { - val fragmentManager = parentFragmentManager - fragmentManager.beginTransaction().apply { - replace(R.id.fcv_main, WineyFeedFragment()) - commit() - } + wineyFeedHeaderAdapter.notifyItemChanged(0) + wineyFeedAdapter.refresh() } private fun WineyPopupMenu.showCustomPosition(anchorView: View) { @@ -326,7 +323,7 @@ class WineyFeedFragment : private fun setSwipeRefreshListener() { binding.layoutWineyfeedRefresh.setOnRefreshListener { - wineyFeedAdapter.refresh() + refreshWineyFeed() binding.layoutWineyfeedRefresh.isRefreshing = false } } diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt index e89c61fd..f01173cf 100644 --- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt +++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt @@ -23,11 +23,14 @@ import com.android.go.sopt.winey.presentation.main.feed.WineyFeedLoadAdapter import com.android.go.sopt.winey.presentation.main.feed.detail.DetailActivity import com.android.go.sopt.winey.presentation.main.mypage.MyPageFragment import com.android.go.sopt.winey.util.binding.BindingFragment +import com.android.go.sopt.winey.util.context.stringOf +import com.android.go.sopt.winey.util.context.wineySnackbar import com.android.go.sopt.winey.util.fragment.WineyDialogFragment import com.android.go.sopt.winey.util.fragment.snackBar import com.android.go.sopt.winey.util.fragment.stringOf import com.android.go.sopt.winey.util.fragment.viewLifeCycle import com.android.go.sopt.winey.util.fragment.viewLifeCycleScope +import com.android.go.sopt.winey.util.fragment.wineySnackbar import com.android.go.sopt.winey.util.view.UiState import com.android.go.sopt.winey.util.view.WineyPopupMenu import com.android.go.sopt.winey.util.view.setOnSingleClickListener @@ -134,6 +137,7 @@ class MyFeedFragment : BindingFragment(R.layout.fragment_ when (state) { is UiState.Success -> { refreshMyFeed() + wineySnackbar(requireView(), true, stringOf(R.string.snackbar_feed_delete_success)) } is UiState.Failure -> { diff --git a/app/src/main/res/drawable/img_wineyfeed_banner_4.png b/app/src/main/res/drawable/img_wineyfeed_banner_4.png deleted file mode 100644 index 10d8af63..00000000 Binary files a/app/src/main/res/drawable/img_wineyfeed_banner_4.png and /dev/null differ diff --git a/app/src/main/res/drawable/img_wineyfeed_banner_4.xml b/app/src/main/res/drawable/img_wineyfeed_banner_4.xml new file mode 100644 index 00000000..e6f7d132 --- /dev/null +++ b/app/src/main/res/drawable/img_wineyfeed_banner_4.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_myfeed.xml b/app/src/main/res/layout/fragment_myfeed.xml index 582d237c..6c7de6a8 100644 --- a/app/src/main/res/layout/fragment_myfeed.xml +++ b/app/src/main/res/layout/fragment_myfeed.xml @@ -108,7 +108,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:overScrollMode="never" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_winey_feed.xml b/app/src/main/res/layout/fragment_winey_feed.xml index eafd3d3b..f171c11e 100644 --- a/app/src/main/res/layout/fragment_winey_feed.xml +++ b/app/src/main/res/layout/fragment_winey_feed.xml @@ -63,7 +63,6 @@ android:layout_height="0dp" android:nestedScrollingEnabled="false" android:orientation="vertical" - android:overScrollMode="never" android:paddingBottom="50dp" android:clipToPadding="false" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" diff --git a/app/src/main/res/layout/item_detail_feed.xml b/app/src/main/res/layout/item_detail_feed.xml index 2bb5c330..88f69148 100644 --- a/app/src/main/res/layout/item_detail_feed.xml +++ b/app/src/main/res/layout/item_detail_feed.xml @@ -65,11 +65,10 @@ @@ -77,8 +76,8 @@