[UI/#53] TerningBasicDialog #61

arinming · 2024-07-12T09:15:28Z

closed [UI] TerningBasicDialog #53

⛳️ Work Description

TerningBasicDialog 구현 및 띄우기
ScrapDialogContent 구현
색상 버튼 toggle 구현

📸 Screenshot

53.mp4

📢 To Reviewers

석준오빠 컬러 팔레트 머지되면 풀 받고 합친 다음 머지하겠습니당~~~~

Hyobeen-Park

다이얼로그 만들어주는 형님 최고최고!! 야무지게 써보겠어요😎 감사합니다!!

Hyobeen-Park · 2024-07-12T09:20:26Z

core/src/main/java/com/terning/core/designsystem/component/dialog/ScrapDialogContent.kt

+                Row(
+                    modifier = Modifier
+                        .width(60.dp)
+                        .height(60.dp)


aspectRatio 사용해도 좋을 것 같아요!

Hyobeen-Park · 2024-07-12T09:25:29Z

core/src/main/java/com/terning/core/designsystem/component/dialog/ScrapDialogContent.kt

+                            modifier = Modifier.padding(bottom = 29.dp),
+                            verticalArrangement = Arrangement.spacedBy(
+                                5.dp,
+                                Alignment.CenterVertically


와우 Arrangement 안에 Alignment 넣을 수 있는거 처음 알았어요..!!

Hyobeen-Park · 2024-07-12T09:28:48Z

core/src/main/java/com/terning/core/designsystem/component/dialog/ScrapDialogContent.kt

+                                stringResource(id = R.string.intern_info_d_day) to "2024년 7월 23일",
+                                stringResource(id = R.string.intern_info_working) to "2개월",
+                                stringResource(id = R.string.intern_info_start_date) to "2024년 8월"


파라미터로 받아오는걸로 수정해야 할 것 같아요!!

아니 진짜 섬세,, ㅠㅠ 고쳤릅니다!

Hyobeen-Park · 2024-07-12T09:33:06Z

core/src/main/java/com/terning/core/designsystem/component/dialog/ScrapDialogContent.kt

+                    } else {
+                        R.string.dialog_scrap_button
+                    },
+                    onButtonClick = { /*TODO*/ },


이렇게 하면 ripple이 생겨서 noRippleClickable 사용하는게 좋을 것 같아요!

흠,,근데 제가 noRippleTheme 작성했었는데 적용이 안 되나요,,?
onButtonClick에 아무 로직이 없어서 그런 것 같기도 한데 한번 해보고 ripple 없는 지 확인해주세요!!!

요거는 유빈이가 만들어준거라서 디폴트로 적용되어 이씁니다!

Hyobeen-Park · 2024-07-12T09:35:33Z

feature/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt

+
+    when {
+        openDialog.value -> {
+            TerningBasicDialog(
+                onDismissRequest = { openDialog.value = false },
+                content = {
+                    ScrapDialogContent(
+                        onDismissRequest = { openDialog.value = false },
+                        isScrapped = false
+                    )
+                }
+            )
+        }
+    }


이거 머지하기 전에 꼭 수정하고 머지해주세요!!

수정 해씀다!

leeeyubin

아린언니 최~~고!!!

leeeyubin · 2024-07-12T12:57:56Z

core/src/main/java/com/terning/core/designsystem/component/dialog/ScrapDialogContent.kt

+            .background(
+                color = White,
+                shape = RoundedCornerShape(20.dp)


요거 자동으로 White 설정은 안 되는 건가용,,?

넹 머터리얼 기본 보라색,,.?희미한 그 색이 되더라구욧..

leeeyubin · 2024-07-12T12:59:26Z

core/src/main/java/com/terning/core/designsystem/component/dialog/ScrapDialogContent.kt

+        ) {
+            IconButton(onClick = { onDismissRequest() }, modifier = Modifier.padding(6.dp)) {
+                Icon(
+                    painter = painterResource(id = R.drawable.ic_dialog_x_32),


줄바꿈!! 해주세요!! 그리구 여기가 X 버튼인 것 같은데 noRippleClickable로 해줘야 할 것 같아요!!

컴포즈는 기본으로 ripple 효과가 들어가기 때문에 요 부분 신경써준다면 감사하겠습니당

넵 적용해씁니다!!!

leeeyubin · 2024-07-12T13:01:30Z

core/src/main/java/com/terning/core/designsystem/component/dialog/ScrapDialogContent.kt

+                    )
+                    if (isColorChange) {
+                        Text(text = "컬러 팔레트")


추출해주세요!!!

leeeyubin · 2024-07-12T13:29:16Z

core/src/main/java/com/terning/core/designsystem/component/dialog/ScrapDialogContent.kt

+                    } else {
+                        R.string.dialog_scrap_button
+                    },
+                    onButtonClick = { /*TODO*/ },


흠,,근데 제가 noRippleTheme 작성했었는데 적용이 안 되나요,,?
onButtonClick에 아무 로직이 없어서 그런 것 같기도 한데 한번 해보고 ripple 없는 지 확인해주세요!!!

leeeyubin · 2024-07-12T18:17:11Z

core/src/main/java/com/terning/core/designsystem/component/item/ColorPalette.kt

 ) {
-    Box(modifier = modifier.size(39.dp)) {
+    Box(modifier = modifier.wrapContentSize()) {
        Box(


굿!!!!!!!!!!!!!

Hyobeen-Park

아리니 최~~~고~~

boiledEgg-s

너무 고생하셨어요~~~ 바로 재사용하러 갑니닷!!!

boiledEgg-s · 2024-07-12T18:28:27Z

core/src/main/java/com/terning/core/designsystem/component/item/ColorPalette.kt

 ) {
-    Box(modifier = modifier.size(39.dp)) {
+    Box(modifier = modifier.wrapContentSize()) {
        Box(


arinming and others added 10 commits July 12, 2024 05:46

[FEAT/#53] TerningDialog 띄우기

e9a360f

[FEAT/#53] TerningDialog 적용중

24a8a79

[UI/#53] 다이얼로그 Properties 속성 추가

21b6e7f

[FEAT/#53] TerningDialog Column 삭제

4dc84b8

[FEAT/#53] DialogContent 공고 정보 추가

8539876

[FEAT/#53] DialogContent 색상 버튼 추가

3681836

[FEAT/#53] DialogContent 스크랩 버튼 추가

1902f26

[FEAT/#53] DialogContent 색상 버튼에 따른 UI 구현

967aa92

[RENAME/#53] 다이얼로그 네이밍 변경

6bac3ba

[FIX/#53] 텍스트 하드코딩 수정

45e3c59

arinming added UI 💐 UI 작업 아린💛 아린 labels Jul 12, 2024

arinming added this to the 1차 스프린트 UI 작업 milestone Jul 12, 2024

arinming requested review from Hyobeen-Park, boiledEgg-s and leeeyubin July 12, 2024 09:15

arinming self-assigned this Jul 12, 2024

arinming linked an issue Jul 12, 2024 that may be closed by this pull request

[UI] TerningBasicDialog #53

Closed

3 tasks

Hyobeen-Park approved these changes Jul 12, 2024

View reviewed changes

leeeyubin approved these changes Jul 12, 2024

View reviewed changes

arinming added 3 commits July 13, 2024 01:08

Merge remote-tracking branch 'origin/develop' into ui/#53-basic-dialog

d2c0fdd

[FEAT/#53] 컬러 팔레트 추가

95deceb

[REFACTOR/#53] 리뷰 기반 리팩토링

b37203d

arinming requested review from leeeyubin and Hyobeen-Park July 12, 2024 16:56

leeeyubin reviewed Jul 12, 2024

View reviewed changes

Hyobeen-Park reviewed Jul 12, 2024

View reviewed changes

boiledEgg-s approved these changes Jul 12, 2024

View reviewed changes

arinming merged commit 655cc53 into develop Jul 12, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[UI/#53] TerningBasicDialog #61

[UI/#53] TerningBasicDialog #61

arinming commented Jul 12, 2024

Hyobeen-Park left a comment

Hyobeen-Park Jul 12, 2024

Hyobeen-Park Jul 12, 2024

Hyobeen-Park Jul 12, 2024

arinming Jul 12, 2024

Hyobeen-Park Jul 12, 2024

leeeyubin Jul 12, 2024

arinming Jul 12, 2024

Hyobeen-Park Jul 12, 2024

arinming Jul 12, 2024

leeeyubin left a comment

leeeyubin Jul 12, 2024

arinming Jul 12, 2024

leeeyubin Jul 12, 2024

arinming Jul 12, 2024

leeeyubin Jul 12, 2024

leeeyubin Jul 12, 2024

leeeyubin Jul 12, 2024

boiledEgg-s Jul 12, 2024

Hyobeen-Park left a comment

boiledEgg-s left a comment

boiledEgg-s Jul 12, 2024

[UI/#53] TerningBasicDialog #61

[UI/#53] TerningBasicDialog #61

Conversation

arinming commented Jul 12, 2024

⛳️ Work Description

📸 Screenshot

📢 To Reviewers

Hyobeen-Park left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

leeeyubin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Hyobeen-Park left a comment

Choose a reason for hiding this comment

boiledEgg-s left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment