diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2f2fb6c8..e4d8a6bb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,7 +11,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.GoingGoing" + android:theme="@style/Theme.Doorip" android:usesCleartextTraffic="true" tools:targetApi="31"> diff --git a/presentation/src/main/res/font/font_pretendard_bold.xml b/presentation/src/main/res/font/font_pretendard_bold.xml new file mode 100644 index 00000000..d2d352de --- /dev/null +++ b/presentation/src/main/res/font/font_pretendard_bold.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/font/font_pretendard_extrabold.xml b/presentation/src/main/res/font/font_pretendard_extrabold.xml new file mode 100644 index 00000000..cd5fce78 --- /dev/null +++ b/presentation/src/main/res/font/font_pretendard_extrabold.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/font/font_pretendard_medium.xml b/presentation/src/main/res/font/font_pretendard_medium.xml new file mode 100644 index 00000000..c995547b --- /dev/null +++ b/presentation/src/main/res/font/font_pretendard_medium.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/font/font_pretendard_regular.xml b/presentation/src/main/res/font/font_pretendard_regular.xml new file mode 100644 index 00000000..9ffa0eb9 --- /dev/null +++ b/presentation/src/main/res/font/font_pretendard_regular.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/font/font_pretendard_semibold.xml b/presentation/src/main/res/font/font_pretendard_semibold.xml new file mode 100644 index 00000000..7b520082 --- /dev/null +++ b/presentation/src/main/res/font/font_pretendard_semibold.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/font/pretendard_bold.ttf b/presentation/src/main/res/font/pretendard_bold.ttf new file mode 100644 index 00000000..315026a8 Binary files /dev/null and b/presentation/src/main/res/font/pretendard_bold.ttf differ diff --git a/presentation/src/main/res/font/pretendard_extrabold.ttf b/presentation/src/main/res/font/pretendard_extrabold.ttf new file mode 100644 index 00000000..81f8fba5 Binary files /dev/null and b/presentation/src/main/res/font/pretendard_extrabold.ttf differ diff --git a/presentation/src/main/res/font/pretendard_medium.ttf b/presentation/src/main/res/font/pretendard_medium.ttf new file mode 100644 index 00000000..eefc6d52 Binary files /dev/null and b/presentation/src/main/res/font/pretendard_medium.ttf differ diff --git a/presentation/src/main/res/font/pretendard_regular.ttf b/presentation/src/main/res/font/pretendard_regular.ttf new file mode 100644 index 00000000..6b010bb4 Binary files /dev/null and b/presentation/src/main/res/font/pretendard_regular.ttf differ diff --git a/presentation/src/main/res/font/pretendard_semibold.ttf b/presentation/src/main/res/font/pretendard_semibold.ttf new file mode 100644 index 00000000..32334f93 Binary files /dev/null and b/presentation/src/main/res/font/pretendard_semibold.ttf differ diff --git a/presentation/src/main/res/layout/activity_mock.xml b/presentation/src/main/res/layout/activity_mock.xml index 19d7b853..91ac8195 100644 --- a/presentation/src/main/res/layout/activity_mock.xml +++ b/presentation/src/main/res/layout/activity_mock.xml @@ -10,7 +10,23 @@ + android:background="@color/black_000"> + + + + + + diff --git a/presentation/src/main/res/layout/item_mock.xml b/presentation/src/main/res/layout/item_mock.xml index cb4e3f6f..4472cdc1 100644 --- a/presentation/src/main/res/layout/item_mock.xml +++ b/presentation/src/main/res/layout/item_mock.xml @@ -19,7 +19,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml index f8c6127d..90ae9975 100644 --- a/presentation/src/main/res/values/colors.xml +++ b/presentation/src/main/res/values/colors.xml @@ -1,10 +1,34 @@ - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF + + + #FAD3C6 + #FCAD95 + #FE8763 + #FE6032 + #FF4F17 + #E03600 + + + #FFFFFF + #151515 + + #F3F3F6 + #C3C4CE + #9093A8 + #4A4D63 + #36394F + #292C3C + #1D1F29 + #15171E + + + #00000000 + #B3000000 + #80000000 + #4D000000 + + + #FEE500 + \ No newline at end of file diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml index 61eaf21b..9cf085bd 100644 --- a/presentation/src/main/res/values/themes.xml +++ b/presentation/src/main/res/values/themes.xml @@ -1,17 +1,13 @@ - + +