Skip to content

Commit 6ba0b5b

Browse files
junseo511junseo511
authored
Merge pull request #668 from Team-WSS/feat/637
feat: 피드 목록 비공개 관련 UI 추가
2 parents 2b51917 + 8fd5430 commit 6ba0b5b

File tree

4 files changed

+82
-60
lines changed

4 files changed

+82
-60
lines changed

‎app/src/main/res/layout/item_feed.xml‎

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -202,33 +202,19 @@
202202
app:layout_constraintTop_toTopOf="@+id/tv_feed_score" />
203203
</androidx.constraintlayout.widget.ConstraintLayout>
204204

205-
<TextView
206-
android:id="@+id/tv_feed_genre"
207-
isVisible="@{!feed.emptyOfRelevantCategories}"
208-
android:layout_width="0dp"
209-
android:layout_height="wrap_content"
210-
android:layout_marginStart="20dp"
211-
android:layout_marginTop="20dp"
212-
android:layout_marginEnd="20dp"
213-
android:text="@{feed.categories}"
214-
android:textAppearance="@style/body2"
215-
android:textColor="@color/gray_200_AEADB3"
216-
app:layout_constraintEnd_toEndOf="parent"
217-
app:layout_constraintStart_toStartOf="parent"
218-
app:layout_constraintTop_toBottomOf="@+id/cl_feed_novel_info"
219-
tools:text="로판" />
220-
221205
<androidx.constraintlayout.widget.ConstraintLayout
222206
android:id="@+id/cl_feed_like"
223207
android:layout_width="wrap_content"
224208
android:layout_height="wrap_content"
225209
android:layout_marginStart="20dp"
226-
android:layout_marginTop="24dp"
210+
android:layout_marginTop="10dp"
227211
android:layout_marginBottom="28dp"
228212
android:onClick="@{(cl_feed_like) -> onClick.onLikeButtonClick(cl_feed_like, feed.id)}"
213+
app:isVisible="@{feed.isPublic}"
229214
app:layout_constraintBottom_toTopOf="@+id/view_feed_indicator"
230215
app:layout_constraintStart_toStartOf="parent"
231-
app:layout_constraintTop_toBottomOf="@+id/tv_feed_genre">
216+
app:layout_constraintTop_toBottomOf="@+id/cl_feed_novel_info"
217+
tools:visibility="gone">
232218

233219
<ImageView
234220
android:id="@+id/iv_feed_thumb_up"
@@ -264,9 +250,11 @@
264250
android:layout_width="wrap_content"
265251
android:layout_height="wrap_content"
266252
android:layout_marginStart="8dp"
253+
app:isVisible="@{feed.isPublic}"
267254
app:layout_constraintBottom_toBottomOf="@+id/cl_feed_like"
268255
app:layout_constraintStart_toEndOf="@+id/cl_feed_like"
269-
app:layout_constraintTop_toTopOf="@+id/cl_feed_like">
256+
app:layout_constraintTop_toTopOf="@+id/cl_feed_like"
257+
tools:visibility="gone">
270258

271259
<ImageView
272260
android:id="@+id/iv_feed_comment"
@@ -298,6 +286,35 @@
298286

299287
</androidx.constraintlayout.widget.ConstraintLayout>
300288

289+
<LinearLayout
290+
android:layout_width="0dp"
291+
android:layout_height="wrap_content"
292+
android:layout_marginTop="10dp"
293+
android:layout_marginBottom="28dp"
294+
android:gravity="center_vertical"
295+
android:paddingHorizontal="20dp"
296+
android:paddingVertical="10dp"
297+
app:isVisible="@{!feed.isPublic}"
298+
app:layout_constraintBottom_toTopOf="@+id/view_feed_indicator"
299+
app:layout_constraintEnd_toEndOf="parent"
300+
app:layout_constraintStart_toStartOf="parent"
301+
app:layout_constraintTop_toBottomOf="@+id/cl_feed_novel_info">
302+
303+
<ImageView
304+
android:layout_width="18dp"
305+
android:layout_height="18dp"
306+
android:src="@drawable/ic_create_novel_lock"
307+
app:tint="@color/gray_200_AEADB3" />
308+
309+
<TextView
310+
android:layout_width="wrap_content"
311+
android:layout_height="wrap_content"
312+
android:layout_marginStart="6dp"
313+
android:text="@string/feed_private_label"
314+
android:textAppearance="@style/body4"
315+
android:textColor="@color/gray_200_AEADB3" />
316+
</LinearLayout>
317+
301318
<View
302319
android:id="@+id/view_feed_indicator"
303320
android:layout_width="match_parent"

‎app/src/main/res/layout/item_feed_detail_header.xml‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -182,33 +182,17 @@
182182
app:layout_constraintTop_toTopOf="@+id/tv_feed_score" />
183183
</androidx.constraintlayout.widget.ConstraintLayout>
184184

185-
<TextView
186-
android:id="@+id/tv_feed_genre"
187-
isVisible="@{!feed.emptyOfRelevantCategories}"
188-
android:layout_width="0dp"
189-
android:layout_height="wrap_content"
190-
android:layout_marginStart="20dp"
191-
android:layout_marginTop="20dp"
192-
android:layout_marginEnd="20dp"
193-
android:text="@{feed.categories}"
194-
android:textAppearance="@style/body2"
195-
android:textColor="@color/gray_200_AEADB3"
196-
app:layout_constraintEnd_toEndOf="parent"
197-
app:layout_constraintStart_toStartOf="parent"
198-
app:layout_constraintTop_toBottomOf="@+id/cl_feed_novel_info"
199-
tools:text="로판" />
200-
201185
<androidx.constraintlayout.widget.ConstraintLayout
202186
android:id="@+id/cl_feed_like"
203187
android:layout_width="wrap_content"
204188
android:layout_height="wrap_content"
205189
android:layout_marginStart="20dp"
206-
android:layout_marginTop="24dp"
190+
android:layout_marginTop="10dp"
207191
android:layout_marginBottom="28dp"
208192
android:onClick="@{(cl_feed_like) -> onClick.onLikeButtonClick(cl_feed_like, feed.id)}"
209193
app:layout_constraintBottom_toTopOf="@+id/view_feed_indicator"
210194
app:layout_constraintStart_toStartOf="parent"
211-
app:layout_constraintTop_toBottomOf="@+id/tv_feed_genre">
195+
app:layout_constraintTop_toBottomOf="@+id/cl_feed_novel_info">
212196

213197
<ImageView
214198
android:id="@+id/iv_feed_thumb_up"

‎app/src/main/res/layout/item_my_activity.xml‎

Lines changed: 43 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
xmlns:tools="http://schemas.android.com/tools">
55

66
<data>
7-
<import type="android.view.View"/>
7+
8+
<import type="android.view.View" />
9+
810
<variable
911
name="activity"
1012
type="com.into.websoso.ui.main.myPage.myActivity.model.ActivitiesModel.ActivityModel" />
@@ -36,9 +38,9 @@
3638
<ImageView
3739
android:id="@+id/iv_my_activity_profile"
3840
cornerRadius="@{12f}"
41+
loadImageUrl="@{userProfile.avatarImage}"
3942
android:layout_width="36dp"
4043
android:layout_height="36dp"
41-
loadImageUrl="@{userProfile.avatarImage}"
4244
app:layout_constraintBottom_toBottomOf="parent"
4345
app:layout_constraintStart_toStartOf="parent"
4446
app:layout_constraintTop_toTopOf="parent"
@@ -75,10 +77,10 @@
7577
android:id="@+id/tv_my_activity_created_date"
7678
android:layout_width="wrap_content"
7779
android:layout_height="wrap_content"
80+
android:layout_marginStart="8dp"
7881
android:text='@{activity.createdDate}'
7982
android:textAppearance="@style/body5"
8083
android:textColor="@color/black"
81-
android:layout_marginStart="8dp"
8284
app:layout_constraintBottom_toBottomOf="@+id/cl_my_activity_profile"
8385
app:layout_constraintStart_toEndOf="@+id/tv_my_activity_dot"
8486
app:layout_constraintTop_toTopOf="@+id/cl_my_activity_profile" />
@@ -113,8 +115,8 @@
113115
android:layout_width="wrap_content"
114116
android:layout_height="wrap_content"
115117
android:layout_marginTop="16dp"
116-
android:text="@string/feed_spoiler_warning"
117118
android:onClick="@{() -> onClick.onContentClick(activity.feedId)}"
119+
android:text="@string/feed_spoiler_warning"
118120
android:textAppearance="@style/body2"
119121
android:textColor="@color/secondary_100_FF675D"
120122
app:isVisible="@{activity.isSpoiler}"
@@ -143,12 +145,12 @@
143145
android:id="@+id/cl_my_activity_novel_info"
144146
android:layout_width="0dp"
145147
android:layout_height="wrap_content"
146-
app:isVisible="@{activity.isNovelInfoAvailable}"
147148
android:layout_marginStart="20dp"
148149
android:layout_marginTop="20dp"
149150
android:layout_marginEnd="20dp"
150-
android:onClick="@{() -> onClick.onNovelInfoClick(activity.novelId)}"
151151
android:background="@drawable/btn_my_activity_novel_info"
152+
android:onClick="@{() -> onClick.onNovelInfoClick(activity.novelId)}"
153+
app:isVisible="@{activity.isNovelInfoAvailable}"
152154
app:layout_constraintEnd_toEndOf="parent"
153155
app:layout_constraintStart_toStartOf="parent"
154156
app:layout_constraintTop_toBottomOf="@+id/tv_my_activity_content">
@@ -218,30 +220,18 @@
218220
app:layout_constraintTop_toTopOf="@+id/tv_my_activity_score" />
219221
</androidx.constraintlayout.widget.ConstraintLayout>
220222

221-
<TextView
222-
android:id="@+id/tv_my_activity_genre"
223-
android:layout_width="0dp"
224-
android:layout_height="wrap_content"
225-
android:layout_marginTop="20dp"
226-
android:text='@{activity.relevantCategories}'
227-
android:textAppearance="@style/body2"
228-
android:layout_marginStart="20dp"
229-
android:textColor="@color/gray_200_AEADB3"
230-
app:layout_constraintStart_toStartOf="parent"
231-
app:layout_constraintTop_toBottomOf="@+id/cl_my_activity_novel_info"
232-
tools:text="로판" />
233-
234223
<androidx.constraintlayout.widget.ConstraintLayout
235224
android:id="@+id/cl_my_activity_like"
236225
android:layout_width="wrap_content"
237226
android:layout_height="wrap_content"
238-
android:layout_marginTop="24dp"
239-
android:layout_marginBottom="28dp"
240227
android:layout_marginStart="20dp"
228+
android:layout_marginTop="10dp"
229+
android:layout_marginBottom="28dp"
241230
android:onClick="@{(cl_my_activity_like) -> onClick.onLikeButtonClick(cl_my_activity_like, activity.feedId)}"
231+
app:isVisible="@{activity.isPublic}"
242232
app:layout_constraintBottom_toTopOf="@+id/view_my_activity_indicator"
243233
app:layout_constraintStart_toStartOf="parent"
244-
app:layout_constraintTop_toBottomOf="@+id/tv_my_activity_genre">
234+
app:layout_constraintTop_toBottomOf="@+id/cl_my_activity_novel_info">
245235

246236
<ImageView
247237
android:id="@+id/iv_my_activity_thumb_up"
@@ -276,6 +266,7 @@
276266
android:layout_width="wrap_content"
277267
android:layout_height="wrap_content"
278268
android:layout_marginStart="8dp"
269+
app:isVisible="@{activity.isPublic}"
279270
app:layout_constraintBottom_toBottomOf="@+id/cl_my_activity_like"
280271
app:layout_constraintStart_toEndOf="@+id/cl_my_activity_like"
281272
app:layout_constraintTop_toTopOf="@+id/cl_my_activity_like">
@@ -310,6 +301,35 @@
310301

311302
</androidx.constraintlayout.widget.ConstraintLayout>
312303

304+
<LinearLayout
305+
android:layout_width="0dp"
306+
android:layout_height="wrap_content"
307+
android:layout_marginTop="10dp"
308+
android:layout_marginBottom="28dp"
309+
android:gravity="center_vertical"
310+
android:paddingHorizontal="20dp"
311+
android:paddingVertical="10dp"
312+
app:isVisible="@{!activity.isPublic}"
313+
app:layout_constraintBottom_toTopOf="@+id/view_my_activity_indicator"
314+
app:layout_constraintEnd_toEndOf="parent"
315+
app:layout_constraintStart_toStartOf="parent"
316+
app:layout_constraintTop_toBottomOf="@+id/cl_my_activity_novel_info">
317+
318+
<ImageView
319+
android:layout_width="18dp"
320+
android:layout_height="18dp"
321+
android:src="@drawable/ic_create_novel_lock"
322+
app:tint="@color/gray_200_AEADB3" />
323+
324+
<TextView
325+
android:layout_width="wrap_content"
326+
android:layout_height="wrap_content"
327+
android:layout_marginStart="6dp"
328+
android:text="@string/feed_private_label"
329+
android:textAppearance="@style/body4"
330+
android:textColor="@color/gray_200_AEADB3" />
331+
</LinearLayout>
332+
313333
<View
314334
android:id="@+id/view_my_activity_indicator"
315335
android:layout_width="match_parent"
@@ -318,4 +338,4 @@
318338
app:layout_constraintBottom_toBottomOf="parent" />
319339

320340
</androidx.constraintlayout.widget.ConstraintLayout>
321-
</layout>
341+
</layout>

‎core/resource/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<string name="feed_removed_feed_snackbar">해당 글을 찾을 수 없어요</string>
110110
<string name="feed_no_more_title">게시글이 없어요</string>
111111
<string name="feed_no_more_content">새 글을 남겨보세요!</string>
112+
<string name="feed_private_label">비공개 기록이에요.</string>
112113

113114
<!-- 피드 상세 뷰 -->
114115
<string name="feed_detail_title">게시글</string>

0 commit comments

Comments
 (0)