Skip to content
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.

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

Feature/align filter component #49

Merged
merged 20 commits into from
Dec 14, 2023
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e85f8d7
feat: SuwikiContainerAlign
BEEEAM-J Dec 8, 2023
94a23f3
feat: SuwikiFilterContainer
BEEEAM-J Dec 8, 2023
f4406cf
fix: SuwikiFilterContainer ๋ณ„ ์ƒ‰ ๋ณ€๊ฒฝ
BEEEAM-J Dec 8, 2023
54b3385
feat: SuwikiFilterButton
BEEEAM-J Dec 8, 2023
2b478a3
Merge branch 'develop' into feature/align-filter-component
BEEEAM-J Dec 8, 2023
8b05322
feat: SuwikiAlignButton
BEEEAM-J Dec 8, 2023
678cc7f
chore: ktlintFormat
BEEEAM-J Dec 8, 2023
7d6c0d5
refactor: SuwikiFilterContainer ๋ณ„ color๋Š” ๋ณ„ ํด๋ฆญ ์—ฌ๋ถ€๋กœ ๋ณ€๊ฒฝํ•˜๋„๋ก ์ˆ˜์ •
BEEEAM-J Dec 8, 2023
5513259
chore: ktlintFormat
BEEEAM-J Dec 8, 2023
da208d5
refactor: SuwikiAlignButton ํด๋ฆญ ๋ฒ”์œ„ ์ˆ˜์ •
BEEEAM-J Dec 10, 2023
515b317
refactor: SuwikiAlignButton ๊ตฌํ˜„ ๋ฐฉ์‹ ์ˆ˜์ •
BEEEAM-J Dec 12, 2023
1941ff1
refactor: SuwikiAlignContainer ํฌ๊ธฐ ๋™์ ์œผ๋กœ ๋ณ€ํ•˜๋„๋ก ์ˆ˜์ •
BEEEAM-J Dec 12, 2023
a3d08b5
refactor: SuwikiFilterButton ๋ถˆํ•„์š”ํ•œ Box ๋ฐ ์†์„ฑ ์ œ๊ฑฐ
BEEEAM-J Dec 12, 2023
5ed97f7
refactor: SuwikiFilterContainer ํฌ๊ธฐ ๋™์ ์œผ๋กœ ๋ณ€ํ•˜๋„๋ก ์ˆ˜์ •
BEEEAM-J Dec 12, 2023
bfcf8b7
chore/#48 : ktlint format
BEEEAM-J Dec 12, 2023
f747056
Merge branch 'develop' into feature/align-filter-component
BEEEAM-J Dec 12, 2023
f180b7c
refactor/#48 : Color, Typography ์ ์šฉ
BEEEAM-J Dec 12, 2023
2b22f9d
refactor/#48 : SuwikiAlignButton shadow ์†์„ฑ ์ถ”๊ฐ€
BEEEAM-J Dec 13, 2023
70a0065
refactor/#48 : ๋ถˆํ•„์š”ํ•œ ํฌ๊ธฐ ์ •์˜ ์ฝ”๋“œ ์ œ๊ฑฐ
BEEEAM-J Dec 13, 2023
0878df1
refactor/#48 : ๋ถˆํ•„์š”ํ•œ ํฌ๊ธฐ ์ •์˜ ์ฝ”๋“œ ์ œ๊ฑฐ ๋ฐ ์ˆ˜์ •
BEEEAM-J Dec 13, 2023
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
Prev Previous commit
Next Next commit
feat: SuwikiAlignButton
BEEEAM-J committed Dec 8, 2023

Verified

This commit was created on GitHub.com and signed with GitHubโ€™s verified signature. The key has expired.
commit 8b0532254f636c540397aeced1d8873d402d7710
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package com.suwiki.core.designsystem.component.align

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.suwiki.core.designsystem.R
import com.suwiki.core.ui.extension.suwikiClickable

@Composable
fun SuwikiAlignButton(
onClick: () -> Unit = {},
) {
Box(
modifier = Modifier
.size(40.dp)
.suwikiClickable(onClick = onClick)
.clip(RoundedCornerShape(10.dp))
.background(Color(0xFFFFFFFF)),
) {
Icon(
painter = painterResource(id = R.drawable.ic_filter),
contentDescription = "",
modifier = Modifier.align(Alignment.Center),
tint = Color(0xFF6A6A6A),
)
}
Copy link
Member

Choose a reason for hiding this comment

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

๊ตณ์ด Box๋กœ ์•ˆ๊ฐ์‹ธ๋„ ๋˜์ง€ ์•Š๋‚˜์š”?

Copy link
Contributor

Choose a reason for hiding this comment

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

์ €๋„ ์š”๋ถ€๋ถ„ ๊ถ๊ธˆํ•ฉ๋‹ˆ๋‹ค ํ•„ํ„ฐ ์•„์ด์ฝ˜์˜ ์ถ”๊ฐ€์ ์œผ๋กœ ๋“ค์–ด๊ฐˆ ๋ ˆ์ด์•„์›ƒ ์žˆ๋‚˜์š”?

Copy link
Member Author

Choose a reason for hiding this comment

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

๋ฒ„ํŠผ๊ณผ ๋‚ด๋ถ€์˜ ์•„์ด์ฝ˜ ์‚ฌ์ด์˜ ๊ฐ„๊ฒฉ์„ ํ‘œํ˜„ํ•˜๋ ค๊ณ  ๋ฐ•์Šค๋กœ ๊ฐ์ŒŒ๋Š”๋ฐ ํ˜น์‹œ ๋” ์ข‹์€ ๋ฐฉ๋ฒ•์ด ์žˆ๋‚˜์š”???

Copy link
Member

Choose a reason for hiding this comment

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

์•„์ด์ฝ˜์— ํŒจ๋”ฉ์„ ์ถ”๊ฐ€ํ•ด๋ณด๋Š”๊ฑด ์–ด๋–ค๊ฐ€์š”?
์‚ฌ์ด์ฆˆ๋„ ์กฐ์ ˆํ•˜๊ตฌ์š”

Copy link
Member Author

Choose a reason for hiding this comment

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

์˜ค์˜ท modifier ์ด๋ ‡๊ฒŒ ์„ค์ •ํ•˜๋‹ˆ๊นŒ ๋˜๋„ค์š”~
ํ•˜๋‚˜ ๋ฐฐ์› ์Šด๋‹ค!

modifier = Modifier
      .size(40.dp)
      .clip(RoundedCornerShape(10.dp))
      .suwikiClickable(onClick = onClick)
      .background(Color(0xFFFFFFFF))
      .padding(8.dp)

}

@Preview(showSystemUi = true)
@Composable
fun SuwikiAlignButtonPreview() {
Column(
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally,
) {
SuwikiAlignButton()
}
}