Skip to content

Commit 52d8093

Browse files
soopeachsoopeach
committed
💄 그룹 상세페이지 아이템 레이아웃 변경
1 parent 35563e3 commit 52d8093

File tree

6 files changed

+71
-102
lines changed

6 files changed

+71
-102
lines changed

‎presentation/src/main/java/com/whyranoid/presentation/community/group/detail/GroupDetailFragment.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ internal class GroupDetailFragment :
4848
R.id.setting_group -> {
4949
// TODO : BottomSheetDialog Material Theme 적용
5050
val dialog = GroupSettingDialog(
51-
// TODO : 그룹 수정으로 이동
5251
onEditButtonClickListener = {
5352
val action =
5453
GroupDetailFragmentDirections.actionGroupDetailFragmentToEditGroupFragment(

‎presentation/src/main/res/drawable/radius_background.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3+
<corners
4+
android:radius="30dp" />
5+
</shape>

‎presentation/src/main/res/layout/my_finish_notification_item.xml

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,25 @@
99
type="com.whyranoid.domain.model.FinishNotification" />
1010
</data>
1111

12-
<androidx.cardview.widget.CardView
12+
<androidx.constraintlayout.widget.ConstraintLayout
1313
android:layout_width="match_parent"
1414
android:layout_height="wrap_content"
15-
android:layout_margin="8dp"
16-
android:elevation="10dp"
17-
app:cardCornerRadius="20dp">
15+
android:padding="8dp"
16+
android:paddingBottom="16dp">
1817

19-
<androidx.constraintlayout.widget.ConstraintLayout
20-
android:layout_width="match_parent"
18+
<TextView
19+
android:id="@+id/tv_end_notification"
20+
style="@style/MoGakRunText.Bold.Medium"
21+
android:layout_width="wrap_content"
2122
android:layout_height="wrap_content"
22-
android:background="@color/mogakrun_secondary_light"
23-
android:padding="8dp"
24-
android:paddingBottom="16dp">
23+
android:layout_margin="8dp"
24+
android:background="@drawable/radius_background"
25+
android:backgroundTint="@color/mogakrun_on_primary"
26+
android:padding="16dp"
27+
app:finishLongToDate="@{notifications.runningHistory.finishedAt}"
28+
app:layout_constraintEnd_toEndOf="parent"
29+
app:layout_constraintTop_toTopOf="parent"
30+
tools:text="2022.11.21 / 21 시 10분 운동 종료"/>
2531

26-
<TextView
27-
android:id="@+id/tv_end_notification"
28-
style="@style/MoGakRunText.Bold.Medium"
29-
android:layout_width="0dp"
30-
android:layout_height="wrap_content"
31-
android:layout_margin="8dp"
32-
android:gravity="end"
33-
app:finishLongToDate="@{notifications.runningHistory.finishedAt}"
34-
app:layout_constraintStart_toStartOf="parent"
35-
app:layout_constraintEnd_toEndOf="parent"
36-
app:layout_constraintTop_toTopOf="parent"
37-
tools:text="2022.11.21 / 21 시 10분 운동 종료"/>
38-
39-
</androidx.constraintlayout.widget.ConstraintLayout>
40-
41-
</androidx.cardview.widget.CardView>
32+
</androidx.constraintlayout.widget.ConstraintLayout>
4233
</layout>

‎presentation/src/main/res/layout/my_start_notification_item.xml

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,25 @@
1010
type="com.whyranoid.domain.model.StartNotification" />
1111
</data>
1212

13-
<androidx.cardview.widget.CardView
13+
<androidx.constraintlayout.widget.ConstraintLayout
1414
android:layout_width="match_parent"
1515
android:layout_height="wrap_content"
16-
android:layout_margin="8dp"
17-
android:elevation="10dp"
18-
app:cardCornerRadius="20dp">
16+
android:padding="8dp"
17+
android:paddingBottom="16dp">
1918

20-
<androidx.constraintlayout.widget.ConstraintLayout
21-
android:layout_width="match_parent"
19+
<TextView
20+
android:id="@+id/tv_start_notification"
21+
style="@style/MoGakRunText.Bold.Medium"
22+
android:layout_width="wrap_content"
2223
android:layout_height="wrap_content"
23-
android:background="@color/mogakrun_primary"
24-
android:padding="8dp"
25-
android:paddingBottom="16dp">
26-
27-
<TextView
28-
android:id="@+id/tv_start_notification"
29-
style="@style/MoGakRunText.Bold.Medium"
30-
android:layout_width="0dp"
31-
android:layout_height="wrap_content"
32-
android:layout_margin="8dp"
33-
android:gravity="end"
34-
app:layout_constraintEnd_toEndOf="parent"
35-
app:layout_constraintStart_toStartOf="parent"
36-
app:layout_constraintTop_toTopOf="parent"
37-
app:startLongToDate="@{notifications.startedAt}"
38-
tools:text="2022.11.21 / 21 시 10분 운동 시작" />
39-
40-
41-
</androidx.constraintlayout.widget.ConstraintLayout>
42-
43-
</androidx.cardview.widget.CardView>
24+
android:layout_margin="8dp"
25+
android:background="@drawable/radius_background"
26+
android:backgroundTint="@color/mogakrun_on_primary"
27+
android:padding="16dp"
28+
app:layout_constraintEnd_toEndOf="parent"
29+
app:layout_constraintTop_toTopOf="parent"
30+
app:startLongToDate="@{notifications.startedAt}"
31+
tools:text="2022.11.21 / 21 시 10분 운동 시작" />
32+
33+
</androidx.constraintlayout.widget.ConstraintLayout>
4434
</layout>

‎presentation/src/main/res/layout/other_finish_notification_item.xml

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,46 +9,37 @@
99
type="com.whyranoid.domain.model.FinishNotification" />
1010
</data>
1111

12-
<androidx.cardview.widget.CardView
12+
<androidx.constraintlayout.widget.ConstraintLayout
1313
android:layout_width="match_parent"
1414
android:layout_height="wrap_content"
15-
android:layout_margin="8dp"
16-
android:elevation="10dp"
17-
app:cardCornerRadius="20dp">
15+
android:padding="8dp"
16+
android:paddingBottom="16dp"
17+
>
1818

19-
<androidx.constraintlayout.widget.ConstraintLayout
20-
android:layout_width="match_parent"
19+
<TextView
20+
android:id="@+id/tv_uid"
21+
style="@style/MoGakRunText.Bold.Small"
22+
android:layout_width="wrap_content"
2123
android:layout_height="wrap_content"
22-
android:background="@color/mogakrun_secondary_dark"
23-
android:padding="8dp"
24-
android:paddingBottom="16dp"
25-
>
24+
android:layout_margin="8dp"
25+
android:text="@{notifications.uid}"
26+
app:layout_constraintStart_toStartOf="parent"
27+
app:layout_constraintTop_toTopOf="parent"
28+
tools:text="수피치"/>
2629

27-
<TextView
28-
android:id="@+id/tv_uid"
29-
style="@style/MoGakRunText.Bold.Large"
30-
android:layout_width="wrap_content"
31-
android:layout_height="wrap_content"
32-
android:layout_margin="8dp"
33-
android:text="@{notifications.uid}"
34-
app:layout_constraintStart_toStartOf="parent"
35-
app:layout_constraintTop_toTopOf="parent"
36-
tools:text="수피치"/>
37-
38-
<TextView
39-
android:id="@+id/tv_end_notification"
40-
style="@style/MoGakRunText.Bold.Medium"
41-
android:layout_width="0dp"
42-
android:layout_height="wrap_content"
43-
android:layout_margin="8dp"
44-
android:gravity="start"
45-
app:finishLongToDate="@{notifications.runningHistory.finishedAt}"
46-
app:layout_constraintStart_toStartOf="parent"
47-
app:layout_constraintEnd_toEndOf="parent"
48-
app:layout_constraintTop_toBottomOf="@id/tv_uid"
49-
tools:text="2022.11.21 / 21 시 10분 운동 종료"/>
50-
51-
</androidx.constraintlayout.widget.ConstraintLayout>
30+
<TextView
31+
android:id="@+id/tv_end_notification"
32+
style="@style/MoGakRunText.Bold.Medium"
33+
android:layout_width="wrap_content"
34+
android:layout_height="wrap_content"
35+
android:layout_margin="8dp"
36+
android:background="@drawable/radius_background"
37+
android:backgroundTint="@color/mogakrun_primary"
38+
android:padding="16dp"
39+
app:finishLongToDate="@{notifications.runningHistory.finishedAt}"
40+
app:layout_constraintStart_toStartOf="parent"
41+
app:layout_constraintTop_toBottomOf="@id/tv_uid"
42+
tools:text="2022.11.21 / 21 시 10분 운동 종료"/>
5243

53-
</androidx.cardview.widget.CardView>
44+
</androidx.constraintlayout.widget.ConstraintLayout>
5445
</layout>

‎presentation/src/main/res/layout/other_start_notification_item.xml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,15 @@
99
type="com.whyranoid.domain.model.StartNotification" />
1010
</data>
1111

12-
<androidx.cardview.widget.CardView
13-
android:layout_width="match_parent"
14-
android:layout_height="wrap_content"
15-
android:layout_margin="8dp"
16-
android:elevation="10dp"
17-
app:cardCornerRadius="20dp">
18-
1912
<androidx.constraintlayout.widget.ConstraintLayout
2013
android:layout_width="match_parent"
2114
android:layout_height="wrap_content"
22-
android:background="@color/mogakrun_primary_dark"
2315
android:padding="8dp"
2416
android:paddingBottom="16dp">
2517

2618
<TextView
2719
android:id="@+id/tv_uid"
28-
style="@style/MoGakRunText.Bold.Large"
20+
style="@style/MoGakRunText.Bold.Small"
2921
android:layout_width="wrap_content"
3022
android:layout_height="wrap_content"
3123
android:layout_margin="8dp"
@@ -37,16 +29,17 @@
3729
<TextView
3830
android:id="@+id/tv_start_notification"
3931
style="@style/MoGakRunText.Bold.Medium"
40-
android:layout_width="0dp"
32+
android:layout_width="wrap_content"
4133
android:layout_height="wrap_content"
4234
android:layout_margin="8dp"
43-
android:gravity="start"
35+
android:background="@drawable/radius_background"
36+
android:backgroundTint="@color/mogakrun_primary"
37+
android:padding="16dp"
4438
app:startLongToDate="@{notifications.startedAt}"
4539
app:layout_constraintStart_toStartOf="parent"
46-
app:layout_constraintEnd_toEndOf="parent"
4740
app:layout_constraintTop_toBottomOf="@id/tv_uid"
4841
tools:text="2022.11.21 / 21 시 10분 운동 시작"/>
4942

5043
</androidx.constraintlayout.widget.ConstraintLayout>
51-
</androidx.cardview.widget.CardView>
44+
5245
</layout>

0 commit comments

Comments
 (0)