Skip to content

Commit

Permalink
Merge pull request #9 from Keyneez/add/#5-font-and-color
Browse files Browse the repository at this point in the history 
[ADD/#5] font 및 color 추가
  • Loading branch information
@etama123
etama123 committed Apr 4, 2023
2 parents 503e074 + 0d896df commit ea1e256
Show file tree
Hide file tree
Showing 9 changed files with 220 additions and 16 deletions.
4 changes: 2 additions & 2 deletions app/src/main/java/com/release/keyneez/MainActivity.kt
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package com.release.keyneez

import android.os.Bundle
import android.util.Log
import androidx.appcompat.app.AppCompatActivity
import com.kakao.sdk.common.util.Utility
import timber.log.Timber

class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)

val keyHash = Utility.getKeyHash(this)
Log.d("Hash", keyHash)
Timber.tag("Hash").d(keyHash)
}
}
15 changes: 15 additions & 0 deletions app/src/main/res/font/keyneez_font.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:font="@font/pretendard_medium"
android:fontStyle="normal"
android:fontWeight="400" />
<font
android:font="@font/pretendard_semibold"
android:fontStyle="normal"
android:fontWeight="600" />
<font
android:font="@font/pretendard_bold"
android:fontStyle="normal"
android:fontWeight="700" />
</font-family>
Binary file added app/src/main/res/font/pretendard_bold.otf
View file
Binary file not shown.
Binary file added app/src/main/res/font/pretendard_medium.otf
View file
Binary file not shown.
Binary file added app/src/main/res/font/pretendard_semibold.otf
View file
Binary file not shown.
10 changes: 4 additions & 6 deletions app/src/main/res/values-night/themes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@
<!-- Base application theme. -->
<style name="Theme.Keyneez" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_500</item>
<item name="colorPrimaryVariant">@color/purple_700</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorPrimary">@color/gray900</item>
<item name="colorPrimaryVariant">@color/gray900</item>
<item name="colorOnPrimary">@color/gray050</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>
<item name="colorSecondaryVariant">@color/teal_700</item>
<item name="colorOnSecondary">@color/black</item>
<item name="colorOnSecondary">@color/gray900</item>
<!-- Status bar color. -->
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>

<!-- Customize your theme here. -->
<!-- Remove font padding -->
<item name="android:includeFontPadding">false</item>
<!-- Remove title bar -->
Expand Down
49 changes: 47 additions & 2 deletions app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,51 @@
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03DAC5</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>

<!-- keyneez colors -->
<color name="mint600">#00A5CB</color>
<color name="mint500">#2CC9ED</color>
<color name="mint400">#69D6EF</color>
<color name="mint300">#AEEDFC</color>
<color name="mint200">#CEF6FF</color>

<color name="red600">#D03607</color>
<color name="red500">#FE5C2B</color>
<color name="red400">#FF825C</color>
<color name="red300">#FFBDA9</color>
<color name="red200">#FFDCD2</color>

<color name="green600">#90B400</color>
<color name="green500">#CBEC00</color>
<color name="green400">#E0F657</color>
<color name="green300">#F0FF96</color>
<color name="green200">#F9FFCD</color>

<color name="purple600">#3A1FAD</color>
<color name="purple500">#6948F7</color>
<color name="purple400">#7F63FA</color>
<color name="purple300">#C6B9FF</color>
<color name="purple200">#E6E0FF</color>

<color name="pink600">#D23C69</color>
<color name="pink500">#FD6D90</color>
<color name="pink400">#FE8BAE</color>
<color name="pink300">#FEC4D6</color>
<color name="pink200">#FFE1E9</color>

<color name="gray900">#000000</color>
<color name="gray800">#1F1F1F</color>
<color name="gray700">#333333</color>
<color name="gary600">#474747</color>
<color name="gray500">#5C5C5C</color>
<color name="gray400">#ADADAD</color>
<color name="gray300">#D6D6D6</color>
<color name="gray200">#EDEDED</color>
<color name="gray100">#F7F7F7</color>
<color name="gray050">#FFFFFF</color>

<!-- custom color -->
<color name="gray900_80">#CC000000</color>
<color name="gray900_20">#33000000</color>
<color name="gray050_80">#CCFFFFFF</color>
</resources>
148 changes: 148 additions & 0 deletions app/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Heading -->
<style name="PretendardBold28">
<item name="android:fontFamily">@font/pretendard_bold</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">28sp</item>
<item name="android:lineSpacingExtra">5.41sp</item>
</style>

<style name="PretendardBold24">
<item name="android:fontFamily">@font/pretendard_bold</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">24sp</item>
<item name="android:lineSpacingExtra">4.64sp</item>
</style>

<style name="PretendardMedium24">
<item name="android:fontFamily">@font/pretendard_medium</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">24sp</item>
<item name="android:lineSpacingExtra">4.64sp</item>
</style>

<style name="PretendardBold20">
<item name="android:fontFamily">@font/pretendard_bold</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">20sp</item>
<item name="android:lineSpacingExtra">3.87sp</item>
</style>

<style name="PretendardSemibold20">
<item name="android:fontFamily">@font/pretendard_semibold</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">20sp</item>
<item name="android:lineSpacingExtra">3.87sp</item>
</style>

<style name="PretendardMedium20">
<item name="android:fontFamily">@font/pretendard_medium</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">20sp</item>
<item name="android:lineSpacingExtra">3.87sp</item>
</style>

<!-- Subtitle -->
<style name="PretendardBold18">
<item name="android:fontFamily">@font/pretendard_bold</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">18sp</item>
<item name="android:lineSpacingExtra">3.48sp</item>
</style>

<style name="PretendardSemibold18">
<item name="android:fontFamily">@font/pretendard_semibold</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">18sp</item>
<item name="android:lineSpacingExtra">3.48sp</item>
</style>

<style name="PretendardMedium18">
<item name="android:fontFamily">@font/pretendard_medium</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">18sp</item>
<item name="android:lineSpacingExtra">3.48sp</item>
</style>

<!-- Body -->
<style name="PretendardBold16">
<item name="android:fontFamily">@font/pretendard_bold</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">16sp</item>
<item name="android:lineSpacingExtra">3.09sp</item>
</style>

<style name="PretendardSemibold16">
<item name="android:fontFamily">@font/pretendard_semibold</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">16sp</item>
<item name="android:lineSpacingExtra">3.09sp</item>
</style>

<style name="PretendardMedium16">
<item name="android:fontFamily">@font/pretendard_medium</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">16sp</item>
<item name="android:lineSpacingExtra">3.09sp</item>
</style>

<style name="PretendardBold14">
<item name="android:fontFamily">@font/pretendard_bold</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">14sp</item>
<item name="android:lineSpacingExtra">2.71sp</item>
</style>

<style name="PretendardSemibold14">
<item name="android:fontFamily">@font/pretendard_semibold</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">14sp</item>
<item name="android:lineSpacingExtra">2.71sp</item>
</style>

<style name="PretendardMedium14">
<item name="android:fontFamily">@font/pretendard_medium</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">14sp</item>
<item name="android:lineSpacingExtra">2.71sp</item>
<item name="android:letterSpacing">-0.045</item>
</style>

<!-- Caption -->
<style name="PretendardSemibold12">
<item name="android:fontFamily">@font/pretendard_semibold</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">12sp</item>
<item name="android:lineSpacingExtra">2.32sp</item>
</style>

<style name="PretendardMedium12">
<item name="android:fontFamily">@font/pretendard_medium</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">12sp</item>
<item name="android:lineSpacingExtra">2.32sp</item>
</style>

<style name="PretendardBold10">
<item name="android:fontFamily">@font/pretendard_bold</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">10sp</item>
<item name="android:lineSpacingExtra">1.93sp</item>
</style>

<style name="PretendardMedium10">
<item name="android:fontFamily">@font/pretendard_medium</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">10sp</item>
<item name="android:lineSpacingExtra">1.93sp</item>
</style>

<!-- Emoji -->
<style name="PretendardMedium40">
<item name="fontFamily">@font/pretendard_medium</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">40sp</item>
<item name="android:lineSpacingExtra">8.01sp</item>
</style>
</resources>
10 changes: 4 additions & 6 deletions app/src/main/res/values/themes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@
<!-- Base application theme. -->
<style name="Theme.Keyneez" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_500</item>
<item name="colorPrimaryVariant">@color/purple_700</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorPrimary">@color/gray900</item>
<item name="colorPrimaryVariant">@color/gray900</item>
<item name="colorOnPrimary">@color/gray050</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>
<item name="colorSecondaryVariant">@color/teal_700</item>
<item name="colorOnSecondary">@color/black</item>
<item name="colorOnSecondary">@color/gray900</item>
<!-- Status bar color. -->
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>

<!-- Customize your theme here. -->
<!-- Remove font padding -->
<item name="android:includeFontPadding">false</item>
<!-- Remove title bar -->
Expand Down

0 comments on commit ea1e256

Please sign in to comment.