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

πŸ”€ :: (#128) - change icon file elements #129

Merged
merged 4 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import com.school_of_company.design_system.R
@Composable
fun ExpoMainLogo(modifier: Modifier = Modifier) {
Icon(
painter = painterResource(id = R.drawable.ic_main_expo_logo),
painter = painterResource(id = R.drawable.logo_expo),
contentDescription = stringResource(id = R.string.main_expo_logo_description),
modifier = modifier
)
Expand Down Expand Up @@ -185,4 +185,49 @@ fun SettingIcon(modifier: Modifier = Modifier) {
contentDescription = stringResource(id = R.string.setting_description),
modifier = modifier
)
}

@Composable
fun CheckBoxIcon(modifier: Modifier = Modifier) {
Icon(
painter = painterResource(id = R.drawable.ic_check_box),
contentDescription = stringResource(id = R.string.checkbox_description),
modifier = modifier
)
}

@Composable
fun DropDownIcon(modifier: Modifier = Modifier) {
Icon(
painter = painterResource(id = R.drawable.ic_drop_down),
contentDescription = stringResource(id = R.string.drop_down_description),
modifier = modifier
)
}

@Composable
fun TwoCircleIcon(modifier: Modifier = Modifier) {
Icon(
painter = painterResource(id = R.drawable.ic_two_circle),
contentDescription = stringResource(id = R.string.two_circle_description),
modifier = modifier
)
}

@Composable
fun LongContentIcon(modifier: Modifier = Modifier) {
Icon(
painter = painterResource(id = R.drawable.ic_long_content),
contentDescription = stringResource(id = R.string.long_content_description),
modifier = modifier
)
}

@Composable
fun ShortContentIcon(modifier: Modifier = Modifier) {
Icon(
painter = painterResource(id = R.drawable.ic_short_content),
contentDescription = stringResource(id = R.string.short_content_description),
modifier = modifier
)
}
9 changes: 9 additions & 0 deletions core/design-system/src/main/res/drawable/ic_check_box.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M16.3,9.2a0.7,0.7 0,0 1,0 1L11,15.6a0.7,0.7 0,0 1,-1 0l-2.3,-2.2a0.8,0.8 0,1 1,1 -1l1.8,1.6 4.7,-4.7a0.7,0.7 0,0 1,1 0ZM21,4.5v15a1.5,1.5 0,0 1,-1.5 1.5h-15A1.5,1.5 0,0 1,3 19.5v-15A1.5,1.5 0,0 1,4.5 3h15A1.5,1.5 0,0 1,21 4.5ZM19.5,19.5v-15h-15v15h15Z"
android:fillColor="#121212"/>
audgns10 marked this conversation as resolved.
Show resolved Hide resolved
</vector>
9 changes: 9 additions & 0 deletions core/design-system/src/main/res/drawable/ic_drop_down.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,2.3a9.7,9.7 0,1 0,0 19.4,9.7 9.7,0 0,0 0,-19.4ZM12,20.3a8.3,8.3 0,1 1,0 -16.6,8.3 8.3,0 0,1 0,16.6ZM16.3,10a0.7,0.7 0,0 1,0 1l-3.8,3.8a0.7,0.7 0,0 1,-1 0L7.7,11a0.8,0.8 0,1 1,1 -1l3.3,3.2 3.2,-3.2a0.7,0.7 0,0 1,1 0Z"
android:fillColor="#121212"/>
audgns10 marked this conversation as resolved.
Show resolved Hide resolved
</vector>
9 changes: 9 additions & 0 deletions core/design-system/src/main/res/drawable/ic_long_content.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M3,6.8a0.8,0.8 0,0 1,0.8 -0.8h16.4a0.7,0.7 0,1 1,0 1.5L3.9,7.5a0.8,0.8 0,0 1,-0.8 -0.8ZM20.3,9.8L3.6,9.8a0.8,0.8 0,0 0,0 1.4h16.6a0.7,0.7 0,1 0,0 -1.4ZM20.3,13.5L3.6,13.5a0.7,0.7 0,1 0,0 1.5h16.6a0.7,0.7 0,1 0,0 -1.5ZM15.7,17.3h-12a0.7,0.7 0,1 0,0 1.4h12a0.7,0.7 0,1 0,0 -1.4Z"
android:fillColor="#121212"/>
</vector>
9 changes: 9 additions & 0 deletions core/design-system/src/main/res/drawable/ic_short_content.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M3,9.8a0.8,0.8 0,0 1,0.8 -0.8h16.4a0.7,0.7 0,1 1,0 1.5L3.9,10.5a0.7,0.7 0,0 1,-0.8 -0.8ZM3.8,14.2h12a0.7,0.7 0,1 0,0 -1.4h-12a0.7,0.7 0,1 0,0 1.4Z"
android:fillColor="#121212"/>
</vector>
12 changes: 12 additions & 0 deletions core/design-system/src/main/res/drawable/ic_two_circle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,2.25C10.072,2.25 8.187,2.822 6.583,3.893C4.98,4.965 3.73,6.487 2.992,8.269C2.254,10.05 2.061,12.011 2.437,13.902C2.814,15.793 3.742,17.531 5.106,18.894C6.469,20.258 8.207,21.187 10.098,21.563C11.989,21.939 13.95,21.746 15.731,21.008C17.513,20.27 19.035,19.02 20.107,17.417C21.178,15.813 21.75,13.928 21.75,12C21.747,9.415 20.719,6.937 18.891,5.109C17.063,3.281 14.585,2.253 12,2.25ZM12,20.25C10.368,20.25 8.773,19.766 7.417,18.86C6.06,17.953 5.002,16.665 4.378,15.157C3.754,13.65 3.59,11.991 3.909,10.391C4.227,8.79 5.013,7.32 6.166,6.166C7.32,5.013 8.79,4.227 10.391,3.909C11.991,3.59 13.65,3.754 15.157,4.378C16.665,5.002 17.953,6.06 18.86,7.417C19.766,8.773 20.25,10.368 20.25,12C20.247,14.187 19.378,16.284 17.831,17.831C16.284,19.378 14.187,20.247 12,20.25Z"
android:fillColor="#121212"/>
<path
android:pathData="M9.222,7.843C10.044,7.293 11.011,7 12,7C13.326,7.001 14.597,7.529 15.534,8.466C16.471,9.403 16.999,10.674 17,12C17,12.989 16.707,13.956 16.157,14.778C15.608,15.6 14.827,16.241 13.913,16.619C13,16.998 11.995,17.097 11.024,16.904C10.055,16.711 9.164,16.235 8.464,15.535C7.765,14.836 7.289,13.945 7.096,12.976C6.903,12.005 7.002,11 7.381,10.087C7.759,9.173 8.4,8.392 9.222,7.843Z"
android:fillColor="#121212"/>
</vector>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions core/design-system/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,9 @@
<string name="bell_description">μ•Œλ¦Ό μ•„μ΄μ½˜</string>
<string name="logout_description">λ‘œκ·Έμ•„μ›ƒ μ•„μ΄μ½˜</string>
<string name="setting_description">μ„ΈνŒ… μ•„μ΄μ½˜</string>
<string name="checkbox_description">μ²΄ν¬λ°•μŠ€ μ•„μ΄μ½˜</string>
<string name="drop_down_description">λ“œλ‘­λ‹€μš΄ μ•„μ΄μ½˜</string>
<string name="two_circle_description">질문 μ•„μ΄μ½˜</string>
<string name="long_content_description">μž₯λ¬Έ μ•„μ΄μ½˜</string>
<string name="short_content_description">단문 μ•„μ΄μ½˜</string>
</resources>
Loading