Skip to content

Commit f9e8f88

Browse files
OjongseokOjongseok
authored
Merge pull request #111 from YAPP-Github/design/#108-icon-change
[design] #108 종석 담당의 아이콘 교체 및 UI 컴포넌트 변경사항 반영
2 parents 65134ac + 6b32f3d commit f9e8f88

42 files changed

Lines changed: 304 additions & 360 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎core/designsystem/src/main/res/drawable/icon_agreement.xml‎

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎core/designsystem/src/main/res/drawable/icon_camera.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎core/designsystem/src/main/res/drawable/icon_camera_filled.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M13.465,4C13.799,4 14.111,4.167 14.297,4.445L15.703,6.555C15.889,6.833 16.201,7 16.535,7H20C20.552,7 21,7.448 21,8V19C21,19.552 20.552,20 20,20H4C3.448,20 3,19.552 3,19V8C3,7.448 3.448,7 4,7H7.69C8.048,7 8.378,6.809 8.557,6.5L9.711,4.5C9.89,4.191 10.22,4 10.577,4H13.465ZM12,9C9.791,9 8,10.791 8,13C8,15.209 9.791,17 12,17C14.209,17 16,15.209 16,13C16,10.791 14.209,9 12,9ZM12,11C13.105,11 14,11.895 14,13C14,14.105 13.105,15 12,15C10.895,15 10,14.105 10,13C10,11.895 10.895,11 12,11ZM17,10V11.5H18.5V10H17Z"
8+
android:fillColor="#ffffff"/>
9+
</vector>

‎core/designsystem/src/main/res/drawable/icon_camera_stroke.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M3,19V8C3,7.448 3.448,7 4,7H7.691C8.048,7 8.378,6.809 8.557,6.5L9.711,4.5C9.89,4.191 10.22,4 10.577,4H13.465C13.799,4 14.111,4.167 14.297,4.445L15.703,6.555C15.889,6.833 16.201,7 16.535,7H20C20.552,7 21,7.448 21,8V19C21,19.552 20.552,20 20,20H4C3.448,20 3,19.552 3,19Z"
8+
android:strokeWidth="2"
9+
android:fillColor="#00000000"
10+
android:strokeColor="#ffffff"/>
11+
<path
12+
android:pathData="M12,13m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
13+
android:strokeWidth="2"
14+
android:fillColor="#00000000"
15+
android:strokeColor="#ffffff"/>
16+
<path
17+
android:pathData="M17,10h1.5v1.5h-1.5z"
18+
android:fillColor="#ffffff"/>
19+
</vector>

‎core/designsystem/src/main/res/drawable/icon_check.xml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="16dp"
3-
android:height="16dp"
4-
android:viewportWidth="16"
5-
android:viewportHeight="16">
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
66
<path
7-
android:pathData="M6.366,10.1L12.017,4.45C12.15,4.317 12.305,4.25 12.483,4.25C12.661,4.25 12.816,4.317 12.95,4.45C13.083,4.583 13.15,4.742 13.15,4.925C13.15,5.109 13.083,5.267 12.95,5.4L6.833,11.533C6.7,11.667 6.544,11.733 6.366,11.733C6.189,11.733 6.033,11.667 5.9,11.533L3.033,8.667C2.9,8.533 2.836,8.375 2.841,8.192C2.846,8.009 2.916,7.85 3.05,7.717C3.184,7.583 3.342,7.516 3.525,7.517C3.708,7.517 3.866,7.584 4,7.717L6.366,10.1Z"
8-
android:fillColor="#ffffff"/>
7+
android:pathData="M4,12.262L8.876,17.211C9.033,17.37 9.29,17.37 9.446,17.211L20,6.5"
8+
android:strokeWidth="2"
9+
android:fillColor="#00000000"
10+
android:strokeColor="#B7B9C3"
11+
android:strokeLineCap="round"/>
912
</vector>

‎core/designsystem/src/main/res/drawable/icon_check_primary.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎core/designsystem/src/main/res/drawable/icon_current_location_off.xml‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎core/designsystem/src/main/res/drawable/icon_current_location_on.xml‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎core/designsystem/src/main/res/drawable/icon_current_position.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="28dp"
3+
android:height="28dp"
4+
android:viewportWidth="28"
5+
android:viewportHeight="28">
6+
<path
7+
android:pathData="M14.013,6.118C18.364,6.118 21.892,9.647 21.892,14C21.892,18.353 18.364,21.882 14.013,21.882C9.662,21.882 6.134,18.353 6.134,14C6.134,9.647 9.662,6.118 14.013,6.118Z"
8+
android:strokeWidth="2"
9+
android:fillColor="#00000000"
10+
android:strokeColor="#3C3E48"
11+
android:strokeLineCap="round"/>
12+
<path
13+
android:pathData="M14,14m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"
14+
android:fillColor="#3C3E48"/>
15+
<path
16+
android:pathData="M13.833,3.333L13.833,6"
17+
android:strokeWidth="2"
18+
android:fillColor="#00000000"
19+
android:strokeColor="#3C3E48"
20+
android:strokeLineCap="round"/>
21+
<path
22+
android:pathData="M13.833,22L13.833,24.667"
23+
android:strokeWidth="2"
24+
android:fillColor="#00000000"
25+
android:strokeColor="#3C3E48"
26+
android:strokeLineCap="round"/>
27+
<path
28+
android:pathData="M24.667,13.833L22,13.833"
29+
android:strokeWidth="2"
30+
android:fillColor="#00000000"
31+
android:strokeColor="#3C3E48"
32+
android:strokeLineCap="round"/>
33+
<path
34+
android:pathData="M6,13.833L3.333,13.833"
35+
android:strokeWidth="2"
36+
android:fillColor="#00000000"
37+
android:strokeColor="#3C3E48"
38+
android:strokeLineCap="round"/>
39+
</vector>

‎core/designsystem/src/main/res/drawable/icon_edit.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
android:viewportWidth="20"
55
android:viewportHeight="20">
66
<path
7-
android:pathData="M3,14.247V16.611C3,16.829 3.171,17 3.389,17H5.753C5.854,17 5.955,16.961 6.025,16.883L14.517,8.399L11.601,5.483L3.117,13.967C3.039,14.045 3,14.138 3,14.247ZM16.773,6.144C16.845,6.072 16.902,5.986 16.941,5.892C16.98,5.798 17,5.697 17,5.595C17,5.494 16.98,5.393 16.941,5.299C16.902,5.205 16.845,5.119 16.773,5.047L14.953,3.227C14.881,3.155 14.795,3.098 14.701,3.059C14.607,3.02 14.506,3 14.405,3C14.303,3 14.202,3.02 14.108,3.059C14.014,3.098 13.928,3.155 13.856,3.227L12.433,4.651L15.349,7.567L16.773,6.144Z"
8-
android:fillColor="#616575"/>
7+
android:pathData="M15.384,7.839L5.973,17.25C5.805,17.418 5.575,17.511 5.338,17.507L3.348,17.473C2.869,17.465 2.486,17.075 2.485,16.597V14.652C2.485,14.42 2.578,14.197 2.742,14.032L12.16,4.615L15.384,7.839ZM14.019,2.757C14.362,2.414 14.917,2.414 15.26,2.757L17.243,4.74C17.586,5.083 17.586,5.638 17.243,5.98L16.004,7.221L12.779,3.997L14.019,2.757Z"
8+
android:fillColor="#74788B"
9+
android:fillType="evenOdd"/>
910
</vector>

0 commit comments

Comments
 (0)