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

[init] 아이콘 세팅 #15

Merged
merged 7 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
4 changes: 3 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
root = true

[*]
max_line_length = off
max_line_length = off
[*.{kt,kts}]
ktlint_function_naming_ignore_when_annotated_with=Composable
11 changes: 4 additions & 7 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ plugins {
alias(libs.plugins.ktlint)
}


val properties =
Properties().apply {
load(project.rootProject.file("local.properties").inputStream())
Expand Down Expand Up @@ -84,10 +83,8 @@ dependencies {
implementation(libs.bundles.retrofit)
implementation(libs.kotlin.serialization.json)

implementation ("androidx.compose.ui:ui:1.6.7")
implementation ("androidx.compose.material:material:1.6.7")
implementation ("androidx.compose.ui:ui-tooling-preview:1.6.7")
androidTestImplementation ("androidx.compose.ui:ui-test-junit4:1.6.7")
implementation("androidx.compose.ui:ui:1.6.7")
implementation("androidx.compose.material:material:1.6.7")
implementation("androidx.compose.ui:ui-tooling-preview:1.6.7")
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.6.7")
}
Copy link
Contributor

Choose a reason for hiding this comment

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

이미 추가되어 있는 부분이라 지워주세요 ~



Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ import org.sopt.kream.theme.head1Bold

@Composable
fun View1Screen(dummyViewModel: DummyViewModel) {
Column (modifier = Modifier.fillMaxSize(),
Column(
modifier = Modifier.fillMaxSize(),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
){
Text(text = "View1 Screen",
verticalArrangement = Arrangement.Center,
) {
Text(
text = "View1 Screen",
style = head1Bold,
color = Gray06)
color = Gray06,
)
}
}
}
236 changes: 127 additions & 109 deletions app/src/main/java/org/sopt/kream/theme/Type.kt
Original file line number Diff line number Diff line change
Expand Up @@ -13,132 +13,150 @@ import org.sopt.kream.R
val Typography =
Typography(
bodyLarge =
TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Normal,
fontSize = 16.sp,
lineHeight = 24.sp,
letterSpacing = 0.5.sp,
)
TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Normal,
fontSize = 16.sp,
lineHeight = 24.sp,
letterSpacing = 0.5.sp,
),
)

// Head
val head1Bold = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_bold)),
fontWeight = FontWeight.Bold,
fontSize = 18.sp
)
val head2Bold = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_bold)),
fontWeight = FontWeight.Bold,
fontSize = 15.sp
)
val head1Bold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_bold)),
fontWeight = FontWeight.Bold,
fontSize = 18.sp,
)
val head2Bold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_bold)),
fontWeight = FontWeight.Bold,
fontSize = 15.sp,
)

// Body1
val body1 = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 17.sp
)
val body1 =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 17.sp,
)

// Body2
val body2 = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 14.sp
)
val body2SemiBold = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontWeight = FontWeight.SemiBold,
fontSize = 14.sp
)
val body2 =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 14.sp,
)
val body2SemiBold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontWeight = FontWeight.SemiBold,
fontSize = 14.sp,
)

// Body3
val body3 = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 13.sp
)
val body3SemiBold = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontWeight = FontWeight.SemiBold,
fontSize = 13.sp
)
val body3 =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 13.sp,
)
val body3SemiBold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontWeight = FontWeight.SemiBold,
fontSize = 13.sp,
)

// Body4
val body4 = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 12.sp
)
val body4SemiBold = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontWeight = FontWeight.SemiBold,
fontSize = 12.sp
)
val body4Bold = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_bold)),
fontWeight = FontWeight.Bold,
fontSize = 12.sp
)
val body4 =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 12.sp,
)
val body4SemiBold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontWeight = FontWeight.SemiBold,
fontSize = 12.sp,
)
val body4Bold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_bold)),
fontWeight = FontWeight.Bold,
fontSize = 12.sp,
)

// Body5
val body5 = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 11.sp
)
val body5SemiBold = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontWeight = FontWeight.SemiBold,
fontSize = 11.sp
)
val body5 =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 11.sp,
)
val body5SemiBold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontWeight = FontWeight.SemiBold,
fontSize = 11.sp,
)

// Body6
val body6 = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 10.sp
)
val body6SemiBold = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontWeight = FontWeight.SemiBold,
fontSize = 10.sp
)
val body6 =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 10.sp,
)
val body6SemiBold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontWeight = FontWeight.SemiBold,
fontSize = 10.sp,
)

// Body7
val body7 = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 9.sp
)
val body7Bold = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_bold)),
fontWeight = FontWeight.Bold,
fontSize = 9.sp
)
val body7 =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 9.sp,
)
val body7Bold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_bold)),
fontWeight = FontWeight.Bold,
fontSize = 9.sp,
)

// Body8
val body8 = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 8.sp
)
val body8SemiBold = TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontWeight = FontWeight.SemiBold,
fontSize = 8.sp
)

val body8 =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontWeight = FontWeight.Normal,
fontSize = 8.sp,
)
val body8SemiBold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontWeight = FontWeight.SemiBold,
fontSize = 8.sp,
)

val notosanskr = FontFamily(
Font(R.font.notosanskr_black, FontWeight.Black, FontStyle.Normal),
Font(R.font.notosanskr_bold, FontWeight.Bold, FontStyle.Normal),
Font(R.font.notosanskr_light, FontWeight.Light, FontStyle.Normal),
Font(R.font.notosanskr_extrabold, FontWeight.ExtraBold, FontStyle.Normal),
Font(R.font.notosanskr_extralight, FontWeight.ExtraLight, FontStyle.Normal),
Font(R.font.notosanskr_medium, FontWeight.Medium, FontStyle.Normal),
Font(R.font.notosanskr_regular, FontWeight.Normal, FontStyle.Normal),
Font(R.font.notosanskr_semibold, FontWeight.SemiBold, FontStyle.Normal),
Font(R.font.notosanskr_thin, FontWeight.Thin, FontStyle.Normal)
)
val notosanskr =
FontFamily(
Font(R.font.notosanskr_black, FontWeight.Black, FontStyle.Normal),
Font(R.font.notosanskr_bold, FontWeight.Bold, FontStyle.Normal),
Font(R.font.notosanskr_light, FontWeight.Light, FontStyle.Normal),
Font(R.font.notosanskr_extrabold, FontWeight.ExtraBold, FontStyle.Normal),
Font(R.font.notosanskr_extralight, FontWeight.ExtraLight, FontStyle.Normal),
Font(R.font.notosanskr_medium, FontWeight.Medium, FontStyle.Normal),
Font(R.font.notosanskr_regular, FontWeight.Normal, FontStyle.Normal),
Font(R.font.notosanskr_semibold, FontWeight.SemiBold, FontStyle.Normal),
Font(R.font.notosanskr_thin, FontWeight.Thin, FontStyle.Normal),
)
20 changes: 20 additions & 0 deletions app/src/main/res/drawable/ic_alarm_28.xml
Copy link
Contributor

Choose a reason for hiding this comment

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

ic_bar_alarm_28

Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="28dp"
android:height="28dp"
android:viewportWidth="28"
android:viewportHeight="28">
<path
android:pathData="M20,11V12V16L22,20.5H19H6.308C6.163,20.5 6.066,20.351 6.125,20.219L8,16V12V11C8,7.686 10.686,5 14,5C17.314,5 20,7.686 20,11Z"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#222222"/>
<path
android:pathData="M12,20V22C12,23.105 12.895,24 14,24V24C15.105,24 16,23.105 16,22V20"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#222222"/>
<path
android:pathData="M25.5,3.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
android:fillColor="#EF6253"/>
</vector>
26 changes: 26 additions & 0 deletions app/src/main/res/drawable/ic_alarmplus_24.xml
Copy link
Contributor

Choose a reason for hiding this comment

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

ic_alarm_plus_24

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<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="M17,10V9C17,5.686 14.314,3 11,3V3C7.686,3 5,5.686 5,9V10V14L3.125,18.219C3.066,18.351 3.163,18.5 3.308,18.5H16"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#222222"/>
<path
android:pathData="M9,18V20C9,21.105 9.895,22 11,22V22C12.105,22 13,21.105 13,20V18"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#222222"/>
<path
android:pathData="M19,12V20"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#222222"/>
<path
android:pathData="M23,16H15"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#222222"/>
</vector>
22 changes: 22 additions & 0 deletions app/src/main/res/drawable/ic_back_24.xml
Copy link
Contributor

Choose a reason for hiding this comment

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

ic_bar_back_24

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<group>
<clip-path
android:pathData="M0,0h24v24h-24z"/>
<path
android:pathData="M19,12H3.001"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#222222"
android:strokeLineCap="square"/>
<path
android:pathData="M10.5,4.5L2.811,11.708C2.643,11.866 2.643,12.134 2.811,12.292L10.5,19.5"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#222222"
android:strokeLineCap="square"/>
</group>
</vector>
Loading
Loading