Skip to content

fix: 마이페이지 및 피드소소 QA 반영 #802

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

Merged
s9hn merged 20 commits into from
Feb 1, 2026
Merged

fix: 마이페이지 및 피드소소 QA 반영 #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a0186b8
fix: 마진 값 수정
m6z1 Jan 24, 2026
62dc5bb
fix: 글 작성 취소 모달 사이즈 수정
m6z1 Jan 31, 2026
b21d74c
fix: 썸네일 내 이미지 개수 수정
m6z1 Jan 24, 2026
9cb9ce0
fix: 터치 영역 수정
m6z1 Jan 24, 2026
4d8c024
fix: 피드 별점 내 별점으로 수정
m6z1 Jan 24, 2026
03143e6
fix: 서재 필터 클릭 시 바텀시트 뜨지 않는 현상 해결
m6z1 Jan 31, 2026
512ade5
fix: 내 피드 글 찾기 필터 로직 수정
m6z1 Jan 31, 2026
192db5e
refactor: 피드 상세 뷰 새로고침 제거
m6z1 Jan 31, 2026
acd2d16
fix: 피드 상세 작품 타이틀 typography 수정
m6z1 Jan 31, 2026
e864ff8
fix: 내 피드 필터 모달 공개/비공개 선택 로직 수정
m6z1 Jan 31, 2026
17ec3b7
fix: api query name 수정
m6z1 Jan 31, 2026
e74f6d4
build: 불필요한 태그 제거
m6z1 Jan 31, 2026
416def7
fix: 추천 글 보이도록 수정
m6z1 Jan 31, 2026
a96fe1e
fix: 더보기 모달 내 피드 로직 수정
m6z1 Jan 31, 2026
867dfde
fix: 내 필터 상태 값 누락된 부분 추가
m6z1 Jan 31, 2026
62d0bcd
refactor: 커서 기반 피드 로딩 로직 수정
m6z1 Jan 31, 2026
77b91fb
fix: 피드 연결 카테고리 빠진 로직 추가
m6z1 Jan 31, 2026
d5da8ab
refactor: 불필요한 배킹프로퍼티 네이밍 제거
m6z1 Jan 31, 2026
4c1096b
fix: 내 필터 모달 첫 진입 시 모든 칩 선택되어 있도록 수정
m6z1 Jan 31, 2026
c141149
fix: 날짜 형식 수정
m6z1 Jan 31, 2026
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
15 changes: 5 additions & 10 deletions app/src/main/java/com/into/websoso/ui/createFeed/CreatingFeedDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@ package com.into.websoso.ui.createFeed

import android.os.Bundle
import android.view.View
import com.into.websoso.R.layout.dialog_editing_cancel_feed
import com.into.websoso.R.layout.dialog_report_popup_menu
import com.into.websoso.core.common.ui.base.BaseDialogFragment
import com.into.websoso.core.common.util.SingleEventHandler
import com.into.websoso.core.resource.R.string.remove_popup_menu_keep_creating
import com.into.websoso.core.resource.R.string.remove_popup_menu_stop_creating
import com.into.websoso.core.resource.R.string.tv_remove_popup_menu_stop_creating
import com.into.websoso.databinding.DialogReportPopupMenuBinding
import com.into.websoso.databinding.DialogEditingCancelFeedBinding
import com.into.websoso.ui.main.feed.FeedFragment.FeedDialogClickListener

class CreatingFeedDialogFragment : BaseDialogFragment<DialogReportPopupMenuBinding>(dialog_report_popup_menu) {
class CreatingFeedDialogFragment : BaseDialogFragment<DialogEditingCancelFeedBinding>(dialog_editing_cancel_feed) {
private val singleEventHandler: SingleEventHandler by lazy { SingleEventHandler.from() }
private val onRemoveClick: FeedDialogClickListener by lazy {
arguments?.getSerializable(EVENT) as FeedDialogClickListener
Expand All @@ -23,11 +21,8 @@ class CreatingFeedDialogFragment : BaseDialogFragment<DialogReportPopupMenuBindi
) {
super.onViewCreated(view, savedInstanceState)

binding.tvReportPopupMenuTitle.text = getString(tv_remove_popup_menu_stop_creating)
binding.tvReportPopupMenuCancel.text = getString(remove_popup_menu_keep_creating)
binding.tvReportPopupMenuReport.text = getString(remove_popup_menu_stop_creating)
binding.tvReportPopupMenuCancel.setOnClickListener { dismiss() }
binding.tvReportPopupMenuReport.setOnClickListener {
binding.tvEditingCancelFeedAlertCancelButton.setOnClickListener { dismiss() }
binding.tvEditingCancelFeedCancelButton.setOnClickListener {
singleEventHandler.throttleFirst {
dismiss()
onRemoveClick()
Expand Down
17 changes: 1 addition & 16 deletions app/src/main/java/com/into/websoso/ui/feedDetail/FeedDetailActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import android.text.Editable
import android.text.TextWatcher
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup.LayoutParams
import android.view.WindowManager.LayoutParams.WRAP_CONTENT
import android.widget.PopupWindow
import android.widget.TextView
Expand Down Expand Up @@ -36,7 +35,6 @@ import com.into.websoso.core.common.util.getS3ImageUrl
import com.into.websoso.core.common.util.hideKeyboard
import com.into.websoso.core.common.util.showWebsosoSnackBar
import com.into.websoso.core.common.util.toFloatPxFromDp
import com.into.websoso.core.common.util.toIntPxFromDp
import com.into.websoso.core.common.util.tracker.Tracker
import com.into.websoso.core.resource.R.drawable.ic_blocked_user_snack_bar
import com.into.websoso.core.resource.R.drawable.ic_novel_detail_check
Expand Down Expand Up @@ -375,7 +373,7 @@ class FeedDetailActivity : BaseActivity<ActivityFeedDetailBinding>(activity_feed
NovelDetailBack.RESULT_OK,
CreateFeed.RESULT_OK,
OtherUserProfileBack.RESULT_OK,
-> {
-> {
feedDetailViewModel.updateFeedDetail(feedId, CreateFeed)
}

Expand Down Expand Up @@ -467,24 +465,13 @@ class FeedDetailActivity : BaseActivity<ActivityFeedDetailBinding>(activity_feed
}

private fun setupView() {
setupRefreshView()
feedDetailViewModel.updateFeedDetail(feedId, Feed, isLiked)
binding.rvFeedDetail.apply {
adapter = feedDetailAdapter
itemAnimator = null
}
}

private fun setupRefreshView() {
binding.sptrFeedRefresh.apply {
setRefreshViewParams(LayoutParams(30.toIntPxFromDp(), 30.toIntPxFromDp()))
setLottieAnimation(LOTTIE_IMAGE)
setOnRefreshListener {
feedDetailViewModel.updateFeedDetail(feedId, FeedDetailRefreshed)
}
}
}

private fun setupObserver() {
feedDetailViewModel.feedDetailUiState.observe(this) { feedDetailUiState ->
when {
Expand Down Expand Up @@ -527,7 +514,6 @@ class FeedDetailActivity : BaseActivity<ActivityFeedDetailBinding>(activity_feed

!feedDetailUiState.loading -> {
binding.wllFeed.setWebsosoLoadingVisibility(false)
binding.sptrFeedRefresh.setRefreshing(false)
updateView(feedDetailUiState)
}
}
Expand Down Expand Up @@ -590,7 +576,6 @@ class FeedDetailActivity : BaseActivity<ActivityFeedDetailBinding>(activity_feed
private const val DEFAULT_FEED_ID: Long = -1
private const val NOTIFICATION_ID: String = "NOTIFICATION_ID"
private const val FEED_LIKE_STATUS: String = "FEED_LIKE_STATUS"
private const val LOTTIE_IMAGE = "lottie_websoso_loading.json"

fun getIntent(
context: Context,
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/com/into/websoso/ui/feedDetail/FeedDetailViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ class FeedDetailViewModel
fun dispatchComment(comment: String) {
feedDetailUiState.value?.let { feedDetailUiState ->
viewModelScope.launch {
_feedDetailUiState.value = feedDetailUiState.copy(loading = true)
runCatching {
feedRepository.saveComment(feedId, comment)
}.onSuccess {
Expand All @@ -214,7 +213,6 @@ class FeedDetailViewModel
fun modifyComment(comment: String) {
feedDetailUiState.value?.let { feedDetailUiState ->
viewModelScope.launch {
_feedDetailUiState.value = feedDetailUiState.copy(loading = true)
runCatching {
feedRepository.saveModifiedComment(feedId, commentId, comment)
}.onSuccess {
Expand Down
9 changes: 6 additions & 3 deletions app/src/main/java/com/into/websoso/ui/main/feed/FeedFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(fragment_feed) {
onFirstItemClick = { feedId, isMyFeed ->
when (isMyFeed) {
true -> navigateToFeedEdit(feedId)

false -> showDialog<DialogReportPopupMenuBinding>(
menuType = ReportMenuType.SPOILER_FEED.name,
event = { feedViewModel.updateReportedSpoilerFeed(feedId) },
Expand Down Expand Up @@ -123,19 +124,21 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(fragment_feed) {
noinline event: () -> Unit,
) {
when (Dialog::class) {
DialogRemovePopupMenuBinding::class ->
DialogRemovePopupMenuBinding::class -> {
FeedRemoveDialogFragment
.newInstance(
menuType = menuType,
event = { event() },
).show(childFragmentManager, FeedRemoveDialogFragment.TAG)
}

DialogReportPopupMenuBinding::class ->
DialogReportPopupMenuBinding::class -> {
FeedReportDialogFragment
.newInstance(
menuType = menuType,
event = { event() },
).show(childFragmentManager, FeedReportDialogFragment.TAG)
}
}
}

Expand All @@ -153,7 +156,7 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(fragment_feed) {
isSpoiler = feed.isSpoiler,
isPublic = feed.isPublic,
feedContent = feed.content,
feedCategory = feed.relevantCategories,
feedCategory = feed.relevantCategoriesByKr,
imageUrls = feed.imageUrls,
)
} ?: throw IllegalArgumentException()
Expand Down
32 changes: 13 additions & 19 deletions app/src/main/res/layout/activity_feed_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,28 +56,22 @@

</androidx.constraintlayout.widget.ConstraintLayout>

<com.simform.refresh.SSPullToRefreshLayout
android:id="@+id/sptr_feed_refresh"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_feed_detail"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="vertical"
android:overScrollMode="never"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toTopOf="@+id/cl_feed_detail_input"
app:layout_constraintTop_toBottomOf="@+id/cl_feed_detail_toolbar">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_feed_detail"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:overScrollMode="never"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />

<com.into.websoso.core.common.ui.custom.WebsosoLoadingLayout
android:id="@+id/wll_feed"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:elevation="100dp"
android:visibility="invisible" />
</com.simform.refresh.SSPullToRefreshLayout>
app:layout_constraintTop_toBottomOf="@+id/cl_feed_detail_toolbar" />

<com.into.websoso.core.common.ui.custom.WebsosoLoadingLayout
android:id="@+id/wll_feed"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:elevation="100dp"
android:visibility="invisible" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_feed_detail_input"
Expand Down
73 changes: 73 additions & 0 deletions app/src/main/res/layout/dialog_editing_cancel_feed.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_novel_detail_white_radius_14dp"
android:padding="20dp">

<ImageView
android:id="@+id/iv_editing_cancel_feed"
android:layout_width="46dp"
android:layout_height="46dp"
android:layout_marginHorizontal="102dp"
android:src="@drawable/ic_novel_detail_warning"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Comment on lines +11 to +19
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot Jan 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

경고 아이콘 접근성 설정이 필요합니다.
장식용 이미지라면 스크린리더 노출을 막고, 의미가 있다면 설명을 추가하세요.

✅ 제안 수정 
 <ImageView
     android:id="@+id/iv_editing_cancel_feed"
+    android:contentDescription="@null"
+    android:importantForAccessibility="no"
     android:layout_width="46dp"
     android:layout_height="46dp"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
<ImageView
android:id="@+id/iv_editing_cancel_feed"
android:layout_width="46dp"
android:layout_height="46dp"
android:layout_marginHorizontal="102dp"
android:src="@drawable/ic_novel_detail_warning"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_editing_cancel_feed"
android:contentDescription="@null"
android:importantForAccessibility="no"
android:layout_width="46dp"
android:layout_height="46dp"
android:layout_marginHorizontal="102dp"
android:src="@drawable/ic_novel_detail_warning"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
🤖 Prompt for AI Agents 
In `@app/src/main/res/layout/dialog_editing_cancel_feed.xml` around lines 11 - 19,
The ImageView with id iv_editing_cancel_feed is missing accessibility info;
decide if it's decorative or meaningful: if decorative, add
android:contentDescription="@null" and android:importantForAccessibility="no" on
iv_editing_cancel_feed to hide it from screen readers; if it conveys meaning,
add a descriptive contentDescription referencing a string resource (e.g.,
`@string/`...), and ensure it is not set focusable or clickable for unintended
traversal.


<TextView
android:id="@+id/tv_editing_cancel_feed_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:gravity="center"
android:maxLines="2"
android:text="@string/tv_remove_popup_menu_stop_creating"
android:textAlignment="center"
android:textAppearance="@style/title2"
android:textColor="@color/black"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_editing_cancel_feed" />

<TextView
android:id="@+id/tv_editing_cancel_feed_cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:background="@drawable/bg_novel_info_gray_50_radius_8dp"
android:gravity="center"
android:paddingHorizontal="36dp"
android:paddingVertical="10dp"
android:text="@string/novel_rating_cancel_alert_accept"
android:textAlignment="center"
android:textAppearance="@style/label1"
android:textColor="@color/gray_300_52515F"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_editing_cancel_feed_alert_cancel_button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_editing_cancel_feed_title" />

<TextView
android:id="@+id/tv_editing_cancel_feed_alert_cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:background="@drawable/bg_novel_info_primary_100_radius_8dp"
android:gravity="center"
android:paddingHorizontal="34dp"
android:paddingVertical="10dp"
android:text="@string/novel_rating_cancel_alert_cancel"
android:textAlignment="center"
android:textAppearance="@style/label1"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="@+id/tv_editing_cancel_feed_cancel_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/tv_editing_cancel_feed_cancel_button"
app:layout_constraintTop_toTopOf="@+id/tv_editing_cancel_feed_cancel_button" />

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
16 changes: 10 additions & 6 deletions app/src/main/res/layout/fragment_my_page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>

<View
android:id="@+id/view_my_page_profile_divider"
android:layout_width="0dp"
android:layout_height="3dp"
android:background="@color/gray_50_F4F5F8"
Expand All @@ -286,7 +287,7 @@
android:id="@+id/cl_my_library_genre_preference"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/cl_my_page_user_profile"
app:layout_constraintTop_toBottomOf="@id/view_my_page_profile_divider"
tools:layout_editor_absoluteX="0dp">

<TextView
Expand Down Expand Up @@ -450,15 +451,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/cl_my_page_user_profile">
app:layout_constraintTop_toBottomOf="@id/view_my_page_profile_divider">

<TextView
android:id="@+id/tv_my_library_preference_analysis_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:paddingVertical="10dp"
android:layout_marginTop="30dp"
android:paddingVertical="0dp"
android:includeFontPadding="false"
android:text="@string/my_page_taste_title"
android:textAppearance="@style/title2"
android:textColor="@color/gray_300_52515F"
Expand Down Expand Up @@ -558,14 +560,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/cl_my_library_genre_preference">
app:layout_constraintTop_toBottomOf="@id/view_my_page_novel_preference_divider">

<TextView
android:id="@+id/tv_my_library_unknown_novel_preference_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="24dp"
android:layout_marginTop="30dp"
android:paddingVertical="0dp"
android:includeFontPadding="false"
android:text="@string/my_page_taste_title"
android:textAppearance="@style/title2"
android:textColor="@color/gray_300_52515F"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/item_feed_detail_header.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
android:ellipsize="end"
android:maxLines="2"
android:text="@{feedDetail.feed.novel.title}"
android:textAppearance="@style/title3"
android:textAppearance="@style/title2"
android:textColor="@color/black"
app:layout_constraintBottom_toTopOf="@id/ll_feed_detail_ratings"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion core/network/src/main/java/com/into/websoso/core/network/datasource/user/UserApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ interface UserApi {
@Path("userId") userId: Long,
@Query("lastFeedId") lastFeedId: Long,
@Query("size") size: Int,
@Query("genres") genres: Array<String>?,
@Query("genreNames") genres: Array<String>?,
@Query("isVisible") isVisible: Boolean?,
@Query("isUnVisible") isUnVisible: Boolean?,
@Query("sortCriteria") sortCriteria: String?,
Expand Down
Loading
Loading