Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mod] 위니피드, 마이피드, 상세페이지 / 1차 릴리즈 qa 피드백 반영 #163

Merged
merged 9 commits into from
Aug 28, 2023
Merged

[mod] 위니피드, 마이피드, 상세페이지 / 1차 릴리즈 qa 피드백 반영 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
03846f0
[mod] #160 위니피드, 마이피드 overScrollMode 허용 제거
sxunea Aug 27, 2023
d43eb64
[chore] #160 위니피드 배너4 파일 교체
sxunea Aug 27, 2023
7651224
[mod] #160 위니피드 배너 너비 조정
sxunea Aug 27, 2023
26f7685
[feat] #160 마이피드 삭제시 스낵바
sxunea Aug 27, 2023
105642c
[mod] #160 삭제 후 리프레시 로직 변경
sxunea Aug 27, 2023
8ccdabd
Merge branch 'develop' into feature/mod-feed-apply-qa
sxunea Aug 27, 2023
4c70d30
[feat] #160 refresh 해도 배너 변하도록 구현
sxunea Aug 27, 2023
4f9e4eb
[mod] #160 디테일피드 이미지 비율 그대로 보여주도록 변경
sxunea Aug 27, 2023
25e0889
[mod] #160 타이틀과 댓글 수 사이 간격 조정
sxunea Aug 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -326,7 +323,7 @@ class WineyFeedFragment :

private fun setSwipeRefreshListener() {
binding.layoutWineyfeedRefresh.setOnRefreshListener {
wineyFeedAdapter.refresh()
refreshWineyFeed()
binding.layoutWineyfeedRefresh.isRefreshing = false
}
}
Expand Down
4 changes: 4 additions & 0 deletions ...src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -134,6 +137,7 @@ class MyFeedFragment : BindingFragment<FragmentMyfeedBinding>(R.layout.fragment_
when (state) {
is UiState.Success -> {
refreshMyFeed()
wineySnackbar(requireView(), true, stringOf(R.string.snackbar_feed_delete_success))
}

is UiState.Failure -> {
Expand Down
Binary file removed app/src/main/res/drawable/img_wineyfeed_banner_4.png
View file
Open in desktop
Binary file not shown.
88 changes: 88 additions & 0 deletions app/src/main/res/drawable/img_wineyfeed_banner_4.xml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion app/src/main/res/layout/fragment_myfeed.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/fragment_winey_feed.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/res/layout/item_detail_feed.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,19 @@

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_detail_image"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="10dp"
app:layout_constraintDimensionRatio="H,4:3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_detail_profile">

<ImageView
android:id="@+id/iv_detail_image"
imageUrl="@{data.feedImage}"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand Down Expand Up @@ -132,6 +131,7 @@
android:id="@+id/tv_detail_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:minHeight="44dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="@{data.feedTitle}"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/item_myfeed_post.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
android:id="@+id/tv_myfeed_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:minHeight="44dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="5dp"
android:text="@{data.feedTitle}"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/item_wineyfeed_header.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@

<ImageView
android:id="@+id/iv_wineyfeed_banner"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
android:layout_marginHorizontal="10dp"
android:layout_marginVertical="12dp"
android:src="@drawable/img_wineyfeed_banner_1"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/item_wineyfeed_post.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
android:id="@+id/tv_wineyfeed_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:minHeight="44dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="5dp"
android:text="@{data.feedTitle}"
Expand Down