Skip to content

Commit

Permalink
refactor: 디자인 수정을 위한 공통 요소 추가 (#378)
Browse files Browse the repository at this point in the history 
* style: 메인 색상 추가

* style: 메인 글꼴 추가

- 던파 비트비트체 ver2

* style: 프로젝트 전체 색상 변경

* style: 아이콘 추가

* refactor: 폰트명 변경

* refactor: rect_main 삭제, 테마 배경색을 color로 지정
  • Loading branch information
@krrong
krrong authored Oct 2, 2023
1 parent 3abfcfd commit 5712df8
Show file tree
Hide file tree
Showing 27 changed files with 176 additions and 147 deletions.
4 changes: 2 additions & 2 deletions ...va/com/now/naaga/presentation/adventurehistory/recyclerview/AdventureHistoryViewHolder.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ class AdventureHistoryViewHolder(private val binding: ItemHistoryBinding) : Recy

private fun setSuccessOrFailure(resultType: AdventureResultType) {
when (resultType) {
AdventureResultType.SUCCESS -> binding.ivAdventureHistoryStamp.setImageResource(R.drawable.ic_success)
AdventureResultType.FAIL -> binding.ivAdventureHistoryStamp.setImageResource(R.drawable.ic_fail)
AdventureResultType.SUCCESS -> binding.ivAdventureHistoryStamp.setImageResource(R.drawable.ic_success_lable)
AdventureResultType.FAIL -> binding.ivAdventureHistoryStamp.setImageResource(R.drawable.ic_fail_lable)
AdventureResultType.NONE -> {}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...d/app/src/main/java/com/now/naaga/presentation/adventureresult/AdventureResultActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ class AdventureResultActivity : AppCompatActivity(), AnalyticsDelegate by Defaul
}

private fun setSuccessTypeView(destinationName: String) {
binding.ivAdventureResultStamp.setImageResource(R.drawable.ic_success)
binding.ivAdventureResultStamp.setImageResource(R.drawable.ic_success_lable)
binding.tvAdventureResultDestination.text = destinationName
}

private fun setFailTypeView() {
binding.ivAdventureResultStamp.setImageResource(R.drawable.ic_fail)
binding.ivAdventureResultStamp.setImageResource(R.drawable.ic_fail_lable)
binding.tvAdventureResultDestination.text = getString(R.string.adventureResult_fail_destination_name)
}

Expand Down
11 changes: 11 additions & 0 deletions android/app/src/main/res/drawable/ic_all_adventure.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="44dp"
android:height="43dp"
android:viewportWidth="44"
android:viewportHeight="43">
<path
android:pathData="M8.637,5.145L20.354,13.301C21.319,13.972 21.5,15.326 20.745,16.227L10.283,28.71C9.745,29.351 8.865,29.59 8.076,29.308L4.955,28.192C4.224,27.93 3.407,28.116 2.86,28.668L2.713,28.817C1.826,29.713 1.979,31.196 3.031,31.891L8.453,35.48C8.675,35.626 8.865,35.816 9.012,36.037L11.802,40.213C12.485,41.235 13.92,41.405 14.823,40.57L14.904,40.495C15.484,39.958 15.694,39.13 15.439,38.381L14.498,35.621C14.234,34.847 14.469,33.99 15.089,33.458L27.722,22.624C28.621,21.854 29.987,22.028 30.664,22.997L39.036,34.986C39.733,35.984 41.156,36.121 42.031,35.276C42.616,34.711 42.794,33.846 42.482,33.095L35.883,17.24C35.553,16.447 35.774,15.534 36.396,14.941C42.244,9.371 42.423,4.998 41.591,3.029C41.444,2.683 41.143,2.431 40.786,2.315C36.724,0.997 31.401,4.786 28.453,7.59C27.851,8.162 26.974,8.358 26.206,8.044L10.554,1.637C9.841,1.346 9.019,1.494 8.449,2.01C7.494,2.873 7.581,4.41 8.637,5.145Z"
android:strokeWidth="2.5"
android:fillColor="#00000000"
android:strokeColor="#ffffff"/>
</vector>
8 changes: 4 additions & 4 deletions android/app/src/main/res/drawable/ic_camera_dialog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
android:fillColor="#E3C6ED"/>
<path
android:pathData="M72,144C111.76,144 144,111.76 144,72C144,32.24 111.76,0 72,0C32.24,0 0,32.24 0,72C0,111.76 32.24,144 72,144Z"
android:fillColor="#E3C6ED"/>
android:fillColor="#FACB10"/>
<path
android:pathData="M82,56.5L98,70L136,105C131.67,114.17 117.4,134 95,140L49.5,95V64H57L61.5,56.5H82Z"
android:fillColor="#D4A5E4"/>
android:fillColor="#F2B70C"/>
<path
android:pathData="M137.5,101.5L90.5,58L98,50.5L141.5,89.5C141,92.17 139.5,98.3 137.5,101.5Z"
android:fillColor="#D4A5E4"/>
android:fillColor="#F2B70C"/>
<path
android:pathData="M95.67,68.13C94.98,68.13 94.32,68.4 93.84,68.88C93.36,69.37 93.08,70.02 93.08,70.71V88.79C93.08,89.48 92.81,90.13 92.33,90.62C91.84,91.1 91.18,91.38 90.5,91.38H54.33C53.65,91.38 52.99,91.1 52.51,90.62C52.02,90.13 51.75,89.48 51.75,88.79V68.13C51.75,67.44 52.02,66.78 52.51,66.3C52.99,65.81 53.65,65.54 54.33,65.54H59.5C60.06,65.57 60.62,65.42 61.09,65.1C61.55,64.78 61.9,64.32 62.08,63.78L63.48,59.55C63.65,59.04 63.98,58.59 64.42,58.27C64.86,57.96 65.39,57.79 65.93,57.79H80.17C80.85,57.79 81.51,57.52 81.99,57.03C82.48,56.55 82.75,55.89 82.75,55.21C82.75,54.52 82.48,53.87 81.99,53.38C81.51,52.9 80.85,52.63 80.17,52.63H65.8C64.18,52.63 62.6,53.14 61.28,54.09C59.97,55.04 58.98,56.38 58.47,57.92L57.64,60.5H54.33C52.28,60.5 50.31,61.32 48.85,62.77C47.4,64.23 46.58,66.2 46.58,68.25V88.92C46.58,90.98 47.4,92.95 48.85,94.4C50.31,95.85 52.28,96.67 54.33,96.67H90.5C92.56,96.67 94.53,95.85 95.98,94.4C97.43,92.95 98.25,90.98 98.25,88.92V70.84C98.27,70.49 98.21,70.14 98.09,69.81C97.97,69.48 97.78,69.18 97.54,68.93C97.3,68.67 97.01,68.47 96.69,68.33C96.36,68.2 96.02,68.12 95.67,68.13ZM72.42,65.54C70.37,65.54 68.37,66.15 66.68,67.28C64.98,68.42 63.65,70.03 62.87,71.92C62.09,73.81 61.88,75.89 62.28,77.89C62.68,79.9 63.66,81.74 65.11,83.18C66.55,84.63 68.4,85.61 70.4,86.01C72.4,86.41 74.48,86.2 76.37,85.42C78.26,84.64 79.87,83.32 81.01,81.62C82.14,79.92 82.75,77.92 82.75,75.88C82.75,73.13 81.66,70.51 79.72,68.57C77.79,66.63 75.16,65.54 72.42,65.54ZM72.42,81.04C71.39,81.04 70.4,80.74 69.55,80.17C68.7,79.6 68.03,78.8 67.64,77.85C67.25,76.91 67.15,75.87 67.35,74.87C67.55,73.86 68.04,72.94 68.76,72.22C69.49,71.5 70.41,71.01 71.41,70.81C72.41,70.61 73.45,70.71 74.39,71.1C75.34,71.49 76.14,72.15 76.71,73C77.28,73.85 77.58,74.85 77.58,75.88C77.58,77.25 77.04,78.56 76.07,79.53C75.1,80.5 73.79,81.04 72.42,81.04ZM100.83,52.63H98.25V50.04C98.25,49.36 97.98,48.7 97.49,48.22C97.01,47.73 96.35,47.46 95.67,47.46C94.98,47.46 94.32,47.73 93.84,48.22C93.36,48.7 93.08,49.36 93.08,50.04V52.63H90.5C89.81,52.63 89.16,52.9 88.67,53.38C88.19,53.87 87.92,54.52 87.92,55.21C87.92,55.89 88.19,56.55 88.67,57.03C89.16,57.52 89.81,57.79 90.5,57.79H93.08V60.38C93.08,61.06 93.36,61.72 93.84,62.2C94.32,62.69 94.98,62.96 95.67,62.96C96.35,62.96 97.01,62.69 97.49,62.2C97.98,61.72 98.25,61.06 98.25,60.38V57.79H100.83C101.52,57.79 102.18,57.52 102.66,57.03C103.14,56.55 103.42,55.89 103.42,55.21C103.42,54.52 103.14,53.87 102.66,53.38C102.18,52.9 101.52,52.63 100.83,52.63Z"
android:pathData="M95.67,68.12C94.98,68.12 94.32,68.4 93.84,68.88C93.36,69.37 93.08,70.02 93.08,70.71V88.79C93.08,89.48 92.81,90.13 92.33,90.62C91.84,91.1 91.19,91.37 90.5,91.37H54.33C53.65,91.37 52.99,91.1 52.51,90.62C52.02,90.13 51.75,89.48 51.75,88.79V68.12C51.75,67.44 52.02,66.78 52.51,66.3C52.99,65.81 53.65,65.54 54.33,65.54H59.5C60.06,65.57 60.62,65.41 61.09,65.1C61.55,64.78 61.9,64.32 62.08,63.78L63.48,59.55C63.65,59.03 63.98,58.59 64.42,58.27C64.86,57.96 65.39,57.79 65.93,57.79H80.17C80.85,57.79 81.51,57.52 81.99,57.03C82.48,56.55 82.75,55.89 82.75,55.21C82.75,54.52 82.48,53.87 81.99,53.38C81.51,52.9 80.85,52.62 80.17,52.62H65.8C64.18,52.63 62.6,53.14 61.28,54.09C59.97,55.04 58.98,56.38 58.47,57.92L57.64,60.5H54.33C52.28,60.5 50.31,61.32 48.85,62.77C47.4,64.23 46.58,66.2 46.58,68.25V88.92C46.58,90.98 47.4,92.95 48.85,94.4C50.31,95.85 52.28,96.67 54.33,96.67H90.5C92.56,96.67 94.53,95.85 95.98,94.4C97.43,92.95 98.25,90.98 98.25,88.92V70.84C98.27,70.49 98.21,70.14 98.09,69.81C97.97,69.48 97.78,69.18 97.54,68.93C97.3,68.67 97.01,68.47 96.69,68.33C96.36,68.2 96.02,68.12 95.67,68.12ZM72.42,65.54C70.37,65.54 68.38,66.15 66.68,67.28C64.98,68.42 63.65,70.03 62.87,71.92C62.09,73.81 61.88,75.89 62.28,77.89C62.68,79.9 63.66,81.74 65.11,83.18C66.56,84.63 68.4,85.61 70.4,86.01C72.41,86.41 74.48,86.2 76.37,85.42C78.26,84.64 79.87,83.31 81.01,81.62C82.14,79.92 82.75,77.92 82.75,75.87C82.75,73.13 81.66,70.51 79.72,68.57C77.79,66.63 75.16,65.54 72.42,65.54ZM72.42,81.04C71.39,81.04 70.4,80.74 69.55,80.17C68.7,79.6 68.03,78.8 67.64,77.85C67.25,76.91 67.15,75.87 67.35,74.87C67.55,73.86 68.04,72.94 68.76,72.22C69.49,71.5 70.41,71.01 71.41,70.81C72.41,70.61 73.45,70.71 74.39,71.1C75.34,71.49 76.14,72.15 76.71,73C77.28,73.85 77.58,74.85 77.58,75.87C77.58,77.25 77.04,78.56 76.07,79.53C75.1,80.5 73.79,81.04 72.42,81.04ZM100.83,52.62H98.25V50.04C98.25,49.36 97.98,48.7 97.49,48.21C97.01,47.73 96.35,47.46 95.67,47.46C94.98,47.46 94.32,47.73 93.84,48.21C93.36,48.7 93.08,49.36 93.08,50.04V52.62H90.5C89.81,52.62 89.16,52.9 88.67,53.38C88.19,53.87 87.92,54.52 87.92,55.21C87.92,55.89 88.19,56.55 88.67,57.03C89.16,57.52 89.81,57.79 90.5,57.79H93.08V60.37C93.08,61.06 93.36,61.72 93.84,62.2C94.32,62.69 94.98,62.96 95.67,62.96C96.35,62.96 97.01,62.69 97.49,62.2C97.98,61.72 98.25,61.06 98.25,60.37V57.79H100.83C101.52,57.79 102.18,57.52 102.66,57.03C103.14,56.55 103.42,55.89 103.42,55.21C103.42,54.52 103.14,53.87 102.66,53.38C102.18,52.9 101.52,52.62 100.83,52.62Z"
android:fillColor="#FFFCFC"/>
</vector>
17 changes: 17 additions & 0 deletions android/app/src/main/res/drawable/ic_fail_adventure.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="47dp"
android:height="46dp"
android:viewportWidth="47"
android:viewportHeight="46">
<path
android:pathData="M20.884,8.043C21.617,6.585 23.691,6.57 24.445,8.016L41.238,40.236C41.932,41.567 40.966,43.16 39.465,43.16H6.486C4.997,43.16 4.03,41.592 4.699,40.262L20.884,8.043Z"
android:strokeWidth="4"
android:fillColor="#00000000"
android:strokeColor="#ffffff"/>
<path
android:pathData="M22.776,14.622L22.776,14.622A1.697,1.697 0,0 1,24.472 16.319L24.472,28.194A1.697,1.697 0,0 1,22.776 29.891L22.776,29.891A1.697,1.697 0,0 1,21.079 28.194L21.079,16.319A1.697,1.697 0,0 1,22.776 14.622z"
android:fillColor="#ffffff"/>
<path
android:pathData="M22.776,35.829m-2.46,0a2.46,2.46 0,1 1,4.92 0a2.46,2.46 0,1 1,-4.92 0"
android:fillColor="#ffffff"/>
</vector>
0 ...oid/app/src/main/res/drawable/ic_fail.xml → ...p/src/main/res/drawable/ic_fail_lable.xml
View file
File renamed without changes.
10 changes: 10 additions & 0 deletions android/app/src/main/res/drawable/ic_flag.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="25dp"
android:height="25dp"
android:viewportWidth="25"
android:viewportHeight="25">
<path
android:pathData="M0.549,0.16C0.246,0.16 0,0.4 0,0.696V23.624C0,23.92 0.246,24.16 0.549,24.16H0.714C1.018,24.16 1.264,23.92 1.264,23.624V12.16H11.29V14.678C11.271,14.901 11.383,15.391 11.976,15.562H13.02H13.075V12.321V12.053V11.624V11.357V0.696C13.075,0.4 12.829,0.16 12.526,0.16H1.154H0.714H0.659H0.549ZM21.684,10.127C21.666,10.102 21.647,10.079 21.627,10.058L21.293,9.59L21.71,8.977L24.905,4.333C25.152,3.973 24.884,3.491 24.44,3.498L18.803,3.589H14.009V15.589H20.962L24.441,15.644C24.884,15.652 25.153,15.17 24.906,14.81L21.684,10.127Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
</vector>
15 changes: 8 additions & 7 deletions android/app/src/main/res/drawable/ic_hint.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<vector android:height="24dp" android:viewportHeight="37"
android:viewportWidth="37" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#00000000"
android:pathData="M22.399,14.698m-6.091,-6.387a8.825,8.825 91.36,1 1,12.181 12.773a8.825,8.825 91.36,1 1,-12.181 -12.773"
android:strokeColor="#ffffff" android:strokeWidth="3"/>
<path android:fillColor="#00000000" android:pathData="M15,22L3,34"
android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="5"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="34dp"
android:height="35dp"
android:viewportWidth="34"
android:viewportHeight="35">
<path
android:pathData="M17,0.16C7.623,0.16 -0,7.783 0,17.161C0,26.538 7.623,34.16 17,34.16C26.378,34.16 34,26.538 34,17.161C34,7.783 26.378,0.16 17,0.16ZM17,2.098C25.331,2.098 32.063,8.83 32.063,17.161C32.063,25.491 25.331,32.223 17,32.223C8.67,32.223 1.937,25.491 1.937,17.161C1.937,8.83 8.67,2.098 17,2.098ZM17.052,2.885C16.795,2.885 16.549,2.987 16.367,3.169C16.186,3.35 16.084,3.597 16.084,3.854V7.217C16.084,7.473 16.186,7.72 16.367,7.902C16.549,8.083 16.795,8.185 17.052,8.185C17.18,8.185 17.306,8.16 17.423,8.112C17.541,8.063 17.647,7.992 17.737,7.902C17.827,7.812 17.899,7.705 17.947,7.587C17.996,7.47 18.021,7.344 18.021,7.217V3.854C18.021,3.726 17.996,3.6 17.947,3.483C17.899,3.365 17.827,3.258 17.737,3.168C17.647,3.078 17.541,3.007 17.423,2.958C17.306,2.91 17.18,2.885 17.052,2.885ZM24.459,8.474C24.316,8.49 24.178,8.538 24.056,8.614L14.632,14.469C14.51,14.545 14.406,14.646 14.329,14.767L8.143,24.358C8.025,24.541 7.973,24.758 7.994,24.975C8.015,25.191 8.108,25.395 8.259,25.552C8.41,25.708 8.609,25.81 8.824,25.84C9.04,25.871 9.259,25.827 9.447,25.717L19.329,19.904C19.47,19.822 19.588,19.705 19.671,19.565L25.401,9.933C25.474,9.809 25.52,9.67 25.533,9.527C25.546,9.384 25.528,9.239 25.478,9.104C25.428,8.969 25.349,8.846 25.247,8.745C25.144,8.644 25.02,8.568 24.884,8.521C24.747,8.474 24.602,8.458 24.459,8.474ZM15.839,16L18.142,18.345L18.132,18.361L11.982,21.978L15.839,16ZM3.634,16.192C3.377,16.192 3.131,16.294 2.949,16.476C2.768,16.657 2.665,16.904 2.665,17.161C2.665,17.288 2.69,17.414 2.739,17.531C2.788,17.649 2.859,17.756 2.949,17.846C3.039,17.936 3.146,18.007 3.264,18.056C3.381,18.104 3.507,18.13 3.634,18.13H6.997C7.254,18.129 7.501,18.027 7.682,17.846C7.864,17.664 7.966,17.418 7.966,17.161C7.966,16.904 7.864,16.657 7.682,16.476C7.501,16.294 7.254,16.192 6.997,16.192H3.634ZM26.889,16.192C26.632,16.192 26.386,16.294 26.204,16.476C26.022,16.657 25.92,16.904 25.92,17.161C25.92,17.288 25.945,17.414 25.994,17.531C26.043,17.649 26.114,17.756 26.204,17.846C26.294,17.936 26.401,18.007 26.518,18.056C26.636,18.104 26.762,18.13 26.889,18.13H30.252C30.379,18.13 30.505,18.104 30.623,18.056C30.74,18.007 30.847,17.936 30.937,17.846C31.027,17.756 31.099,17.649 31.147,17.531C31.196,17.414 31.221,17.288 31.221,17.161C31.221,16.904 31.119,16.657 30.937,16.476C30.756,16.294 30.509,16.192 30.252,16.192H26.889ZM17.051,26.136C16.794,26.136 16.548,26.238 16.366,26.42C16.184,26.601 16.082,26.848 16.082,27.105V30.468C16.082,30.725 16.184,30.971 16.366,31.153C16.548,31.335 16.794,31.437 17.051,31.437C17.308,31.437 17.554,31.334 17.736,31.153C17.918,30.971 18.02,30.725 18.02,30.468V27.105C18.02,26.848 17.918,26.602 17.736,26.42C17.554,26.238 17.308,26.136 17.051,26.136Z"
android:fillColor="#ffffff"/>
</vector>
Loading

0 comments on commit 5712df8

Please sign in to comment.