Skip to content

feat: 피드 목록 비공개 관련 UI 추가 #668

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
junseo511 merged 5 commits into from
May 4, 2025
Merged

feat: 피드 목록 비공개 관련 UI 추가 #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a22047
feat: 피드 목록 비공개 여부 표시
junseo511 May 4, 2025
badbf0a
fix: 누락된 새로고침 로직 추가
junseo511 May 4, 2025
587bf4f
refactor: 와일드카드 사용 제거
junseo511 May 4, 2025
06d30a4
refactor: 문자열 리소스 추출
junseo511 May 4, 2025
8fd5430
refactor: 뒤로가기 버튼 로직 롤백
junseo511 May 4, 2025
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
55 changes: 36 additions & 19 deletions app/src/main/res/layout/item_feed.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,33 +202,19 @@
app:layout_constraintTop_toTopOf="@+id/tv_feed_score" />
</androidx.constraintlayout.widget.ConstraintLayout>

<TextView
android:id="@+id/tv_feed_genre"
isVisible="@{!feed.emptyOfRelevantCategories}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:text="@{feed.categories}"
android:textAppearance="@style/body2"
android:textColor="@color/gray_200_AEADB3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cl_feed_novel_info"
tools:text="로판" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_feed_like"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="24dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="28dp"
android:onClick="@{(cl_feed_like) -> onClick.onLikeButtonClick(cl_feed_like, feed.id)}"
app:isVisible="@{feed.isPublic}"
app:layout_constraintBottom_toTopOf="@+id/view_feed_indicator"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_feed_genre">
app:layout_constraintTop_toBottomOf="@+id/cl_feed_novel_info"
tools:visibility="gone">

<ImageView
android:id="@+id/iv_feed_thumb_up"
Expand Down Expand Up @@ -264,9 +250,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
app:isVisible="@{feed.isPublic}"
app:layout_constraintBottom_toBottomOf="@+id/cl_feed_like"
app:layout_constraintStart_toEndOf="@+id/cl_feed_like"
app:layout_constraintTop_toTopOf="@+id/cl_feed_like">
app:layout_constraintTop_toTopOf="@+id/cl_feed_like"
tools:visibility="gone">

<ImageView
android:id="@+id/iv_feed_comment"
Expand Down Expand Up @@ -298,6 +286,35 @@

</androidx.constraintlayout.widget.ConstraintLayout>

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="28dp"
android:gravity="center_vertical"
android:paddingHorizontal="20dp"
android:paddingVertical="10dp"
app:isVisible="@{!feed.isPublic}"
app:layout_constraintBottom_toTopOf="@+id/view_feed_indicator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cl_feed_novel_info">

<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_create_novel_lock"
app:tint="@color/gray_200_AEADB3" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:text="@string/feed_private_label"
android:textAppearance="@style/body4"
android:textColor="@color/gray_200_AEADB3" />
</LinearLayout>

<View
android:id="@+id/view_feed_indicator"
android:layout_width="match_parent"
Expand Down
20 changes: 2 additions & 18 deletions 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 @@ -182,33 +182,17 @@
app:layout_constraintTop_toTopOf="@+id/tv_feed_score" />
</androidx.constraintlayout.widget.ConstraintLayout>

<TextView
android:id="@+id/tv_feed_genre"
isVisible="@{!feed.emptyOfRelevantCategories}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:text="@{feed.categories}"
android:textAppearance="@style/body2"
android:textColor="@color/gray_200_AEADB3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cl_feed_novel_info"
tools:text="로판" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_feed_like"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="24dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="28dp"
android:onClick="@{(cl_feed_like) -> onClick.onLikeButtonClick(cl_feed_like, feed.id)}"
app:layout_constraintBottom_toTopOf="@+id/view_feed_indicator"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_feed_genre">
app:layout_constraintTop_toBottomOf="@+id/cl_feed_novel_info">

<ImageView
android:id="@+id/iv_feed_thumb_up"
Expand Down
66 changes: 43 additions & 23 deletions app/src/main/res/layout/item_my_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
xmlns:tools="http://schemas.android.com/tools">

<data>
<import type="android.view.View"/>

<import type="android.view.View" />

<variable
name="activity"
type="com.into.websoso.ui.main.myPage.myActivity.model.ActivitiesModel.ActivityModel" />
Expand Down Expand Up @@ -36,9 +38,9 @@
<ImageView
android:id="@+id/iv_my_activity_profile"
cornerRadius="@{12f}"
loadImageUrl="@{userProfile.avatarImage}"
android:layout_width="36dp"
android:layout_height="36dp"
loadImageUrl="@{userProfile.avatarImage}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
Expand Down Expand Up @@ -75,10 +77,10 @@
android:id="@+id/tv_my_activity_created_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text='@{activity.createdDate}'
android:textAppearance="@style/body5"
android:textColor="@color/black"
android:layout_marginStart="8dp"
app:layout_constraintBottom_toBottomOf="@+id/cl_my_activity_profile"
app:layout_constraintStart_toEndOf="@+id/tv_my_activity_dot"
app:layout_constraintTop_toTopOf="@+id/cl_my_activity_profile" />
Expand Down Expand Up @@ -113,8 +115,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/feed_spoiler_warning"
android:onClick="@{() -> onClick.onContentClick(activity.feedId)}"
android:text="@string/feed_spoiler_warning"
android:textAppearance="@style/body2"
android:textColor="@color/secondary_100_FF675D"
app:isVisible="@{activity.isSpoiler}"
Expand Down Expand Up @@ -143,12 +145,12 @@
android:id="@+id/cl_my_activity_novel_info"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:isVisible="@{activity.isNovelInfoAvailable}"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:onClick="@{() -> onClick.onNovelInfoClick(activity.novelId)}"
android:background="@drawable/btn_my_activity_novel_info"
android:onClick="@{() -> onClick.onNovelInfoClick(activity.novelId)}"
app:isVisible="@{activity.isNovelInfoAvailable}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_my_activity_content">
Expand Down Expand Up @@ -218,30 +220,18 @@
app:layout_constraintTop_toTopOf="@+id/tv_my_activity_score" />
</androidx.constraintlayout.widget.ConstraintLayout>

<TextView
android:id="@+id/tv_my_activity_genre"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text='@{activity.relevantCategories}'
android:textAppearance="@style/body2"
android:layout_marginStart="20dp"
android:textColor="@color/gray_200_AEADB3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cl_my_activity_novel_info"
tools:text="로판" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_my_activity_like"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_marginBottom="28dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="28dp"
android:onClick="@{(cl_my_activity_like) -> onClick.onLikeButtonClick(cl_my_activity_like, activity.feedId)}"
app:isVisible="@{activity.isPublic}"
app:layout_constraintBottom_toTopOf="@+id/view_my_activity_indicator"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_my_activity_genre">
app:layout_constraintTop_toBottomOf="@+id/cl_my_activity_novel_info">

<ImageView
android:id="@+id/iv_my_activity_thumb_up"
Expand Down Expand Up @@ -276,6 +266,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
app:isVisible="@{activity.isPublic}"
app:layout_constraintBottom_toBottomOf="@+id/cl_my_activity_like"
app:layout_constraintStart_toEndOf="@+id/cl_my_activity_like"
app:layout_constraintTop_toTopOf="@+id/cl_my_activity_like">
Expand Down Expand Up @@ -310,6 +301,35 @@

</androidx.constraintlayout.widget.ConstraintLayout>

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="28dp"
android:gravity="center_vertical"
android:paddingHorizontal="20dp"
android:paddingVertical="10dp"
app:isVisible="@{!activity.isPublic}"
app:layout_constraintBottom_toTopOf="@+id/view_my_activity_indicator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cl_my_activity_novel_info">

<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_create_novel_lock"
app:tint="@color/gray_200_AEADB3" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:text="@string/feed_private_label"
android:textAppearance="@style/body4"
android:textColor="@color/gray_200_AEADB3" />
</LinearLayout>

<View
android:id="@+id/view_my_activity_indicator"
android:layout_width="match_parent"
Expand All @@ -318,4 +338,4 @@
app:layout_constraintBottom_toBottomOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
</layout>
1 change: 1 addition & 0 deletions core/resource/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
<string name="feed_removed_feed_snackbar">해당 글을 찾을 수 없어요</string>
<string name="feed_no_more_title">게시글이 없어요</string>
<string name="feed_no_more_content">새 글을 남겨보세요!</string>
<string name="feed_private_label">비공개 기록이에요.</string>

<!-- 피드 상세 뷰 -->
<string name="feed_detail_title">게시글</string>
Expand Down
Loading