-
Notifications
You must be signed in to change notification settings - Fork 0
[design] #108 아이콘 리소스 변경 및 포즈 필터바 공용 컴포넌트 분리 #112
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
7750082
[design] #108: Arrow, Close, Bell Icon 수정
ikseong00 602540b
[refactor] #108: 포즈 화면 필터링 UI를 공용 컴포넌트로 분리
ikseong00 0e5ef4d
[design] #108: 아이콘 리소스 이름 및 경로 변경
ikseong00 04027b6
[design] #108: NekiTheme 색상 적용
ikseong00 13d6901
[chore] #108: 불필요한 import 제거
ikseong00 2facc72
[chore] #108: Detekt 룰 적용
ikseong00 cc4ed60
[refactor] #108: vectorResource 블록 내에사 if else 구문 선언
ikseong00 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24"> | ||
| android:width="28dp" | ||
| android:height="28dp" | ||
| android:viewportWidth="28" | ||
| android:viewportHeight="28"> | ||
| <path | ||
| android:pathData="M20,4L4,20" | ||
| android:pathData="M23,5L5,23" | ||
| android:strokeWidth="2" | ||
| android:fillColor="#00000000" | ||
| android:strokeColor="#ffffff" | ||
| android:strokeColor="#3C3E48" | ||
| android:strokeLineCap="round"/> | ||
| <path | ||
| android:pathData="M20,20L4,4" | ||
| android:pathData="M23,23L5,5" | ||
| android:strokeWidth="2" | ||
| android:fillColor="#00000000" | ||
| android:strokeColor="#ffffff" | ||
| android:strokeColor="#3C3E48" | ||
| android:strokeLineCap="round"/> | ||
| </vector> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
core/designsystem/src/main/res/drawable/icon_heart_filled.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="28dp" | ||
| android:height="28dp" | ||
| android:viewportWidth="28" | ||
| android:viewportHeight="28"> | ||
| <path | ||
| android:pathData="M14.5,6.684L15.225,5.787C17.329,3.18 21.148,2.737 23.799,4.792C26.642,6.996 26.977,11.149 24.522,13.776L14.844,24.132C14.658,24.331 14.342,24.331 14.157,24.132L4.478,13.776C2.024,11.149 2.358,6.996 5.202,4.792C7.853,2.737 11.672,3.18 13.776,5.787L14.5,6.684Z" | ||
| android:fillColor="#ffffff"/> | ||
| </vector> |
13 changes: 0 additions & 13 deletions
13
core/designsystem/src/main/res/drawable/icon_heart_stroke.xml
This file was deleted.
Oops, something went wrong.
12 changes: 12 additions & 0 deletions
12
core/designsystem/src/main/res/drawable/icon_heart_stroked.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="28dp" | ||
| android:height="28dp" | ||
| android:viewportWidth="28" | ||
| android:viewportHeight="28"> | ||
| <path | ||
| android:pathData="M15.669,6.415C17.431,4.233 20.632,3.86 22.853,5.582C25.232,7.426 25.51,10.897 23.458,13.093L14.167,23.035L4.875,13.093C2.824,10.897 3.103,7.426 5.482,5.582C7.703,3.861 10.903,4.234 12.665,6.415L13.389,7.313L14.167,8.275L14.945,7.313L15.669,6.415Z" | ||
| android:strokeWidth="2" | ||
| android:fillColor="#00000000" | ||
| android:strokeColor="#4F525F" | ||
| android:strokeLineCap="square"/> | ||
| </vector> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24"> | ||
| <path | ||
| android:pathData="M16,4L19,7L16,10" | ||
| android:strokeLineJoin="round" | ||
| android:strokeWidth="2" | ||
| android:fillColor="#00000000" | ||
| android:strokeColor="#FF5647" | ||
| android:strokeLineCap="round"/> | ||
| <path | ||
| android:pathData="M8,20L5,17L8,14" | ||
| android:strokeLineJoin="round" | ||
| android:strokeWidth="2" | ||
| android:fillColor="#00000000" | ||
| android:strokeColor="#FF5647" | ||
| android:strokeLineCap="round"/> | ||
| <path | ||
| android:pathData="M5,12V10.333C5,9.449 5.304,8.601 5.846,7.976C6.388,7.351 7.123,7 7.889,7H18" | ||
| android:strokeLineJoin="round" | ||
| android:strokeWidth="2" | ||
| android:fillColor="#00000000" | ||
| android:strokeColor="#FF5647" | ||
| android:strokeLineCap="round"/> | ||
| <path | ||
| android:pathData="M19,12V13.667C19,14.551 18.696,15.399 18.154,16.024C17.612,16.649 16.877,17 16.111,17H6" | ||
| android:strokeLineJoin="round" | ||
| android:strokeWidth="2" | ||
| android:fillColor="#00000000" | ||
| android:strokeColor="#FF5647" | ||
| android:strokeLineCap="round"/> | ||
| </vector> |
38 changes: 0 additions & 38 deletions
38
core/designsystem/src/main/res/drawable/icon_repeat_recommendation.xml
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
13 changes: 13 additions & 0 deletions
13
core/designsystem/src/main/res/drawable/icon_scrap_filled.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="28dp" | ||
| android:height="28dp" | ||
| android:viewportWidth="28" | ||
| android:viewportHeight="28"> | ||
| <group> | ||
| <clip-path | ||
| android:pathData="M0,0h28v28h-28z"/> | ||
| <path | ||
| android:pathData="M6.167,3.5C6.167,2.855 6.689,2.333 7.334,2.333H21.334C21.978,2.333 22.5,2.855 22.5,3.5V24.911C22.5,25.258 22.135,25.484 21.825,25.329L14.542,21.687C14.411,21.622 14.256,21.622 14.125,21.687L6.842,25.329C6.532,25.484 6.167,25.258 6.167,24.911V3.5Z" | ||
| android:fillColor="#202227"/> | ||
| </group> | ||
| </vector> |
16 changes: 16 additions & 0 deletions
16
core/designsystem/src/main/res/drawable/icon_scrap_stroked.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="28dp" | ||
| android:height="28dp" | ||
| android:viewportWidth="28" | ||
| android:viewportHeight="28"> | ||
| <group> | ||
| <clip-path | ||
| android:pathData="M0,0h28v28h-28z"/> | ||
| <path | ||
| android:pathData="M7,3.333H21C21.092,3.333 21.167,3.408 21.167,3.5V24.048L14.656,20.793L14.498,20.726C14.177,20.609 13.824,20.609 13.502,20.726L13.344,20.793L6.833,24.048V3.5C6.833,3.408 6.908,3.333 7,3.333Z" | ||
| android:strokeWidth="2" | ||
| android:fillColor="#00000000" | ||
| android:strokeColor="#74788B" | ||
| android:strokeLineCap="round"/> | ||
| </group> | ||
| </vector> |
13 changes: 0 additions & 13 deletions
13
core/designsystem/src/main/res/drawable/icon_scrap_unselected.xml
This file was deleted.
Oops, something went wrong.
10 changes: 10 additions & 0 deletions
10
core/designsystem/src/main/res/drawable/icon_torch_off.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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="28dp" | ||
| android:height="28dp" | ||
| android:viewportWidth="28" | ||
| android:viewportHeight="28"> | ||
| <path | ||
| android:pathData="M17.187,2.333C17.475,2.334 17.697,2.452 17.852,2.687C18.013,2.916 18.026,3.225 17.892,3.615L14.988,11.852L20.726,11.943C20.954,11.95 21.142,12.024 21.29,12.165C21.444,12.307 21.521,12.488 21.521,12.709C21.521,12.945 21.427,13.18 21.239,13.415L16.146,19.661L11.641,25.213C11.385,25.522 11.112,25.673 10.823,25.667C10.541,25.666 10.319,25.549 10.158,25.314C9.997,25.085 9.983,24.776 10.117,24.386L13.021,16.148L7.284,16.057C7.056,16.057 6.864,15.986 6.709,15.845C6.555,15.697 6.478,15.512 6.478,15.29C6.478,15.062 6.575,14.83 6.77,14.595L11.903,8.288L16.379,2.788C16.628,2.478 16.897,2.327 17.187,2.333Z" | ||
| android:fillColor="#ffffff" | ||
| android:fillType="evenOdd"/> | ||
| </vector> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="28dp" | ||
| android:height="28dp" | ||
| android:viewportWidth="28" | ||
| android:viewportHeight="28"> | ||
| <path | ||
| android:pathData="M11.648,25.213C11.393,25.522 11.12,25.673 10.831,25.666C10.549,25.666 10.327,25.549 10.166,25.313C10.004,25.085 9.991,24.776 10.125,24.386L13.03,16.148L7.292,16.057C7.063,16.057 6.872,15.986 6.717,15.845C6.563,15.697 6.485,15.512 6.485,15.291C6.485,15.062 6.583,14.83 6.778,14.595L8.926,11.943L16.377,19.384L11.648,25.213ZM19.09,16.067L11.638,8.625L16.387,2.787C16.636,2.478 16.905,2.327 17.194,2.333C17.483,2.333 17.705,2.451 17.859,2.686C18.021,2.915 18.034,3.224 17.9,3.614L14.996,11.852L20.733,11.943C20.962,11.95 21.15,12.024 21.298,12.165C21.452,12.306 21.53,12.487 21.53,12.709C21.53,12.944 21.436,13.18 21.247,13.415L19.09,16.067Z" | ||
| android:fillColor="#ffffff"/> | ||
| <path | ||
| android:pathData="M6.47,6.47L21.53,21.531" | ||
| android:strokeWidth="2" | ||
| android:fillColor="#00000000" | ||
| android:strokeColor="#ffffff" | ||
| android:strokeLineCap="round"/> | ||
| </vector> | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.