Skip to content

Commit

Permalink
[1.1.0/AN-UI] 타입 아이콘 불일치 수정 (#345)
Browse files Browse the repository at this point in the history 
* refactor: 타입 아이콘 불일치 변경

* refactor: 타입 색상 변경

* refactor: 독 타입 변경

* refactor: 독 타입 색상 변경
  • Loading branch information
@kkosang
kkosang authored Oct 8, 2024
1 parent 81f1b66 commit c26fa01
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 55 deletions.
40 changes: 27 additions & 13 deletions android/app/src/main/res/drawable/icon_type_dark.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,29 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="256dp"
android:height="256dp"
android:viewportWidth="256"
android:viewportHeight="256">
<path
android:pathData="M128,128m-128,0a128,128 0,1 1,256 0a128,128 0,1 1,-256 0"
android:fillColor="#4f4747"/>
<path
android:pathData="M74.46,84.24c7.49,7.56 17.75,14.95 27.04,16.93 -1.38,2.84 -1.88,5.07 -2.37,8.23 -2.78,17.82 -1.19,34.63 12.15,48.3 10.06,10.31 23.45,10.28 33.51,-0.09 13.29,-13.71 14.91,-30.51 12.01,-48.33 -0.43,-2.62 -1.93,-9.15 -1.88,-9.24 0.1,-0.18 0,-0.08 1,-0.38 6.48,-1.51 18.62,-7.99 26.05,-15.5 15.36,11.88 23.65,36.91 14.18,56.85 -12.94,27.24 -43.16,51.76 -81.43,43.96 -29.15,-5.94 -49.04,-24.49 -57.95,-53.21 -4.14,-13.33 1.67,-35.98 17.7,-47.52Z"
android:fillColor="#fff"/>
<path
android:pathData="M139.92,124.38c-0.27,5.3 -0.79,12.61 -6.05,18.45 -4.12,4.57 -7.96,4.83 -11.66,-0.03 -7.43,-9.75 -7.46,-20.89 -4.48,-32.19 1.96,-7.42 2.86,-7.9 10.26,-7.9 7.41,0 7.97,0.58 10.38,7.85 1.28,3.88 1.58,7.78 1.56,13.83Z"
android:fillColor="#fff"/>
android:width="18dp"
android:height="18dp"
android:viewportWidth="18"
android:viewportHeight="18">
<path
android:fillColor="#D9D9D9"
android:pathData="M18,9C18,13.971 13.971,18 9,18C4.029,18 0,13.971 0,9C0,4.029 4.029,0 9,0C13.971,0 18,4.029 18,9Z" />
<path
android:fillColor="#4E4747"
android:pathData="M18,9C18,13.971 13.971,18 9,18C4.029,18 0,13.971 0,9C0,4.029 4.029,0 9,0C13.971,0 18,4.029 18,9Z" />
<path
android:fillColor="#ffffff"
android:pathData="M7.333,9.958H9V15H6.917V14H6.083V13H5.25V11.5H4V7H5.25V6H6.083V8.5H6.917V9.5L7.333,9.958Z" />
<path
android:fillColor="#ffffff"
android:pathData="M7,6H6.083V4.733H6.917V4H7.5V5H7V6Z" />
<path
android:fillColor="#ffffff"
android:pathData="M11.167,9.958H9.5V15H11.583V14H12.417V13H13.25V11.5H14.5V7H13.25V6H12.417V8.5H11.583V9.5L11.167,9.958Z" />
<path
android:fillColor="#ffffff"
android:pathData="M11.5,6H12.417V4.733H11.583V4H11V5H11.5V6Z" />
<path
android:fillColor="#00000000"
android:pathData="M6.083,6V8.5H6.917V9.5L7.333,9.958H9V15H6.917V14H6.083V13H5.25V11.5H4V7H5.25V6H6.083ZM6.083,6H7V5H7.5V4H6.917V4.733H6.083V6ZM12.417,6V8.5H11.583V9.5L11.167,9.958H9.5V15H11.583V14H12.417V13H13.25V11.5H14.5V7H13.25V6H12.417ZM12.417,6H11.5V5H11V4H11.583V4.733H12.417V6Z"
android:strokeWidth="0.5"
android:strokeColor="#ffffff" />
</vector>
45 changes: 35 additions & 10 deletions android/app/src/main/res/drawable/icon_type_fairy.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,40 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="256dp"
android:height="256dp"
android:viewportWidth="256"
android:viewportHeight="256">
android:width="18dp"
android:height="18dp"
android:viewportWidth="18"
android:viewportHeight="18">
<path
android:pathData="M128,128m-128,0a128,128 0,1 1,256 0a128,128 0,1 1,-256 0"
android:fillColor="#e18ce1"/>
android:pathData="M9,9m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
android:fillColor="#D9D9D9"/>
<path
android:pathData="M168.54,132.61c3.77,6.74 7.72,12.55 9.17,19.5 2.22,10.62 -1.21,14.8 -11.95,15.74 -7.15,0.63 -10.23,0.58 -23.99,-6.3 -0.72,12.68 10.42,26.54 7.56,40.13 -0.3,1.42 -2.11,1.88 -3.1,0.81 -10.72,-11.57 -11.42,-26.96 -18.23,-40.53 -6.59,13.45 -7.73,28.65 -17.98,40.71 -0.94,1.1 -2.77,0.71 -3.11,-0.7 -3.31,-13.62 7.93,-26.82 7.68,-39.39 -4.82,3.96 -16,5.77 -22.74,5.34 -12.59,-0.8 -15.97,-5 -13.2,-17.17 1.5,-6.62 5.97,-11.71 8.57,-18.3 -7.97,-5.14 -16.04,-9.4 -21.66,-17.39 -10.4,-14.76 -10.88,-31.08 -9.17,-47.77 0.67,-6.56 6.56,-8.82 12.68,-9 22.43,-0.65 42.31,4.56 55.63,24.61q0.69,1.04 3.11,5.35 2.46,-3.75 3.18,-4.86c13.12,-20.16 32.89,-25.76 55.37,-25.1 9.84,0.29 13.27,4.35 13.86,14.36 0.99,16.72 -1.38,32.29 -12.39,45.93 -5.05,6.25 -12.22,8.98 -19.28,14.02Z"
android:fillColor="#fff"/>
android:pathData="M9,9m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
android:fillColor="#F5B4FA"/>
<path
android:pathData="M128.01,97.38c3.43,10.49 11.99,18.83 23.75,18.89 -4.1,10.72 -12.19,14.1 -21.2,14.91 -10.89,0.98 -20.09,-2.8 -26.74,-14.02 11.02,-1.56 20.04,-8.95 24.18,-19.79Z"
android:fillColor="#e291e2"/>
android:pathData="M3.5,3.5V4.5H4.5V3.5H3.5Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M3.5,4.5H2.5V10.5H3.5V13H4.5V14H6.5V16H8V13H6.5V12H4.5V9.5H3.5V4.5Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M3.5,4.5H2.5V10.5H3.5V13H4.5V14H6.5V16H8V13H6.5V12H4.5V9.5H3.5V4.5Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M14,3.5V4.5H13V3.5H14Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M14,4.5H15V10.5H14V13H13V14H11V16H9.5V13H11V12H13V9.5H14V4.5Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M14,4.5H15V10.5H14V13H13V14H11V16H9.5V13H11V12H13V9.5H14V4.5Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M3.5,4.5V3.5H4.5V4.5H3.5ZM3.5,4.5H2.5V10.5H3.5V13H4.5V14H6.5V16H8V13H6.5V12H4.5V9.5H3.5V4.5ZM14,4.5V3.5H13V4.5H14ZM14,4.5H15V10.5H14V13H13V14H11V16H9.5V13H11V12H13V9.5H14V4.5Z"
android:strokeWidth="0.5"
android:fillColor="#00000000"
android:strokeColor="#ffffff"/>
<path
android:pathData="M8.538,3.6V2.267V2H9.462V3.6H11V4.4H9.462V6H8.538V4.4H7.923H7V3.6H8.538Z"
android:strokeWidth="0.5"
android:fillColor="#ffffff"
android:strokeColor="#ffffff"/>
</vector>
29 changes: 19 additions & 10 deletions android/app/src/main/res/drawable/icon_type_ice.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="256dp"
android:height="256dp"
android:viewportWidth="256"
android:viewportHeight="256">
android:width="18dp"
android:height="18dp"
android:viewportWidth="18"
android:viewportHeight="18">
<path
android:pathData="M128,128m-128,0a128,128 0,1 1,256 0a128,128 0,1 1,-256 0"
android:fillColor="#47c8c8"/>
android:pathData="M18,9C18,13.971 13.971,18 9,18C4.029,18 0,13.971 0,9C0,4.029 4.029,0 9,0C13.971,0 18,4.029 18,9Z"
android:fillColor="#D9D9D9"/>
<path
android:pathData="M110.36,60.61c6.05,-5.88 11.4,-11.09 17.77,-17.29 5.97,6.13 11.17,11.47 17.14,17.59 -4.92,5.79 -9.31,10.96 -14.74,17.36 12.8,7.44 26.4,16.32 40.07,24.27v-23.26h24.01c0,7.81 0.09,16.68 0.09,25.33 -21.7,0 -5.65,0.26 -22.24,0.26 0,15.36 0.44,31.53 0.44,47.51h21.79v24.18h-23.94v-21.88c-13.22,7.56 -27.06,15.34 -40.38,22.95 5.13,5.9 9.4,10.79 14.9,17.11 -5.37,5.66 -10.66,11.23 -17.36,18.29 -5.96,-6.39 -11.21,-12.02 -17.12,-18.36 4.98,-5.7 9.44,-10.8 14.84,-16.97 -13.25,-7.61 -27,-15.35 -40.37,-23.03v22.22h-24.05v-24.46h22.03c0,-15.56 -0.08,-32.89 -0.08,-48.86l-22.05,-0.08v-24.22h24.22c0,21.72 0,2.88 0,21.24 13.09,-7.41 26.69,-14.32 40.16,-21.95 -5.03,-5.96 -9.38,-11.12 -15.15,-17.95Z"
android:fillColor="#fbfdfd"/>
android:pathData="M18,9C18,13.971 13.971,18 9,18C4.029,18 0,13.971 0,9C0,4.029 4.029,0 9,0C13.971,0 18,4.029 18,9Z"
android:fillColor="#72D5FB"/>
<path
android:pathData="M96.46,140.79v-32.06c12.55,-7.16 12.55,-6.81 27.27,-15.03l6.03,7.93c-22.64,12.82 0.71,-0.29 -22.64,12.82v26.34h-10.66Z"
android:fillColor="#64cfcf"/>
android:pathData="M9,2L6,5H12L10.5,3.5L9,2Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M6,5H12V9L9,15L6,9V5ZM6.5,10L6.299,8.597L7,8H7.5L8,8.5V9L8.25,9.5L8.75,10H9V12.5L7.701,11.903L6.5,10Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:strokeWidth="1"
android:pathData="M6,5L9,2L10.5,3.5L12,5M6,5H12M6,5V9L9,15L12,9V5M11,16L13,12L14,11V12L11,16ZM7,16L4,12V11L5,12L6,14L7,16ZM7,8L6.299,8.597L6.5,10L7.701,11.903L9,12.5V10H8.75L8.25,9.5L8,9V8.5L7.5,8H7Z"
android:fillColor="#00000000"
android:strokeColor="#ffffff"/>
</vector>
Binary file added android/app/src/main/res/drawable/icon_type_poison.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 0 additions & 18 deletions android/app/src/main/res/drawable/icon_type_poison.xml
View file

This file was deleted.

8 changes: 4 additions & 4 deletions android/app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@
<color name="poke_fire">#E3613F</color>
<color name="poke_flying">#75A9D0</color>
<color name="poke_steel">#73B1CC</color>
<color name="poke_ice">#46C8C8</color>
<color name="poke_ice">#72D5FB</color>
<color name="poke_water">#3199E2</color>
<color name="poke_dragon">#016ECA</color>
<color name="poke_poison">#9454CC</color>
<color name="poke_poison">#b567cf</color>
<color name="poke_ghost">#704572</color>
<color name="poke_ground">#E87236</color>
<color name="poke_psychic">#FF6675</color>
<color name="poke_bug">#9f9f27</color>
<color name="poke_rock">#C8B686</color>
<color name="poke_normal">#828282</color>
<color name="poke_dark">#514747</color>
<color name="poke_fairy">#E08CE0</color>
<color name="poke_dark">#4E4747</color>
<color name="poke_fairy">#F5B4FA</color>
<color name="item_pokemon_background_gray">#242627</color>

<!-- stats -->
Expand Down

0 comments on commit c26fa01

Please sign in to comment.