-
Notifications
You must be signed in to change notification settings - Fork 0
Rename Sports & Outdoors to Active and swap category art for line icons #111
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
Open
AndrewG828
wants to merge
1
commit into
main
Choose a base branch
from
user/andrewgao/feature/UI-UX-Lucid-Refactor
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions
12
Resell/Resources/Assets.xcassets/Active.imageset/Contents.json
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 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "Soccer Ball Alt - Iconly Pro.svg", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
9 changes: 9 additions & 0 deletions
9
Resell/Resources/Assets.xcassets/Active.imageset/Soccer Ball Alt - Iconly Pro.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions
9
Resell/Resources/Assets.xcassets/Books.imageset/Open Book - Iconly Pro.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed
BIN
-11.7 KB
Resell/Resources/Assets.xcassets/Books.imageset/stack of books2.png
Binary file not shown.
Binary file not shown.
Binary file removed
BIN
-13.9 KB
Resell/Resources/Assets.xcassets/Clothing.imageset/pink sneakers floating2.png
Binary file not shown.
Binary file removed
BIN
-25.7 KB
Resell/Resources/Assets.xcassets/Clothing.imageset/pink sneakers floating3.png
Binary file not shown.
9 changes: 9 additions & 0 deletions
9
...l/Resources/Assets.xcassets/Electronics.imageset/Old TV Basic - Iconly Pro.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed
BIN
-9.84 KB
Resell/Resources/Assets.xcassets/Electronics.imageset/airpods max pink2.png
Binary file not shown.
Binary file removed
BIN
-18.6 KB
Resell/Resources/Assets.xcassets/Electronics.imageset/airpods max pink3.png
Binary file not shown.
9 changes: 9 additions & 0 deletions
9
...esources/Assets.xcassets/Handmade.imageset/Wall Picture Frame - Iconly Pro.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed
BIN
-10.3 KB
Resell/Resources/Assets.xcassets/Handmade.imageset/color palette and brush2.png
Binary file not shown.
Binary file removed
BIN
-19.3 KB
Resell/Resources/Assets.xcassets/Handmade.imageset/color palette and brush3.png
Binary file not shown.
12 changes: 12 additions & 0 deletions
12
Resell/Resources/Assets.xcassets/Household.imageset/Contents.json
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 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "Gas Stove - Iconly Pro.svg", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
9 changes: 9 additions & 0 deletions
9
Resell/Resources/Assets.xcassets/Household.imageset/Gas Stove - Iconly Pro.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions
9
Resell/Resources/Assets.xcassets/Other.imageset/Air Humidifier - Iconly Pro.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 7 additions & 18 deletions
25
Resell/Resources/Assets.xcassets/Other.imageset/Contents.json
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,23 +1,12 @@ | ||
| { | ||
| "images": [ | ||
| "images" : [ | ||
| { | ||
| "filename": "orange gift box on ground.png", | ||
| "idiom": "universal", | ||
| "scale": "1x" | ||
| }, | ||
| { | ||
| "filename": "orange gift box on ground 1.png", | ||
| "idiom": "universal", | ||
| "scale": "2x" | ||
| }, | ||
| { | ||
| "filename": "orange gift box on ground 2.png", | ||
| "idiom": "universal", | ||
| "scale": "3x" | ||
| "filename" : "Air Humidifier - Iconly Pro.svg", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info": { | ||
| "author": "xcode", | ||
| "version": 1 | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } | ||
| } |
Binary file removed
BIN
-2.92 KB
Resell/Resources/Assets.xcassets/Other.imageset/orange gift box on ground 1.png
Binary file not shown.
Binary file removed
BIN
-2.92 KB
Resell/Resources/Assets.xcassets/Other.imageset/orange gift box on ground 2.png
Binary file not shown.
Binary file removed
BIN
-2.92 KB
Resell/Resources/Assets.xcassets/Other.imageset/orange gift box on ground.png
Binary file not shown.
9 changes: 9 additions & 0 deletions
9
Resell/Resources/Assets.xcassets/School.imageset/School Backpack - Iconly Pro.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
23 changes: 0 additions & 23 deletions
23
Resell/Resources/Assets.xcassets/Sports & Outdoors.imageset/Contents 2.json
This file was deleted.
Oops, something went wrong.
23 changes: 0 additions & 23 deletions
23
Resell/Resources/Assets.xcassets/Sports & Outdoors.imageset/Contents.json
This file was deleted.
Oops, something went wrong.
Binary file removed
BIN
-3.4 KB
Resell/Resources/Assets.xcassets/Sports & Outdoors.imageset/rugby ball.png
Binary file not shown.
Binary file removed
BIN
-9.77 KB
Resell/Resources/Assets.xcassets/Sports & Outdoors.imageset/rugby ball2.png
Binary file not shown.
Binary file removed
BIN
-18 KB
Resell/Resources/Assets.xcassets/Sports & Outdoors.imageset/rugby ball3.png
Binary file not shown.
25 changes: 7 additions & 18 deletions
25
Resell/Resources/Assets.xcassets/books.imageset/Contents.json
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,23 +1,12 @@ | ||
| { | ||
| "images": [ | ||
| "images" : [ | ||
| { | ||
| "filename": "stack of books.png", | ||
| "idiom": "universal", | ||
| "scale": "1x" | ||
| }, | ||
| { | ||
| "filename": "stack of books2.png", | ||
| "idiom": "universal", | ||
| "scale": "2x" | ||
| }, | ||
| { | ||
| "filename": "stack of books3.png", | ||
| "idiom": "universal", | ||
| "scale": "3x" | ||
| "filename" : "Open Book - Iconly Pro.svg", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info": { | ||
| "author": "xcode", | ||
| "version": 1 | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } | ||
| } |
Binary file not shown.
9 changes: 9 additions & 0 deletions
9
Resell/Resources/Assets.xcassets/clothing.imageset/Beige Jacket - Iconly Pro.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 7 additions & 18 deletions
25
Resell/Resources/Assets.xcassets/clothing.imageset/Contents.json
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,23 +1,12 @@ | ||
| { | ||
| "images": [ | ||
| "images" : [ | ||
| { | ||
| "filename": "pink sneakers floating.png", | ||
| "idiom": "universal", | ||
| "scale": "1x" | ||
| }, | ||
| { | ||
| "filename": "pink sneakers floating2.png", | ||
| "idiom": "universal", | ||
| "scale": "2x" | ||
| }, | ||
| { | ||
| "filename": "pink sneakers floating3.png", | ||
| "idiom": "universal", | ||
| "scale": "3x" | ||
| "filename" : "Beige Jacket - Iconly Pro.svg", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info": { | ||
| "author": "xcode", | ||
| "version": 1 | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } | ||
| } |
Binary file removed
BIN
-4.62 KB
Resell/Resources/Assets.xcassets/clothing.imageset/pink sneakers floating.png
Diff not rendered.
25 changes: 7 additions & 18 deletions
25
Resell/Resources/Assets.xcassets/electronics.imageset/Contents.json
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,23 +1,12 @@ | ||
| { | ||
| "images": [ | ||
| "images" : [ | ||
| { | ||
| "filename": "airpods max pink.png", | ||
| "idiom": "universal", | ||
| "scale": "1x" | ||
| }, | ||
| { | ||
| "filename": "airpods max pink2.png", | ||
| "idiom": "universal", | ||
| "scale": "2x" | ||
| }, | ||
| { | ||
| "filename": "airpods max pink3.png", | ||
| "idiom": "universal", | ||
| "scale": "3x" | ||
| "filename" : "Old TV Basic - Iconly Pro.svg", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info": { | ||
| "author": "xcode", | ||
| "version": 1 | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } | ||
| } |
Binary file removed
BIN
-3.57 KB
Resell/Resources/Assets.xcassets/electronics.imageset/airpods max pink.png
Diff not rendered.
15 changes: 2 additions & 13 deletions
15
Resell/Resources/Assets.xcassets/filters.imageset/Contents.json
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
Diff not rendered.
1 change: 1 addition & 0 deletions
1
Resell/Resources/Assets.xcassets/filters.imageset/Icons List Filter.svg
Oops, something went wrong.
Binary file removed
BIN
-437 Bytes
Resell/Resources/Assets.xcassets/filters.imageset/rivet-icons_filter 1.png
Diff not rendered.
Diff not rendered.
25 changes: 7 additions & 18 deletions
25
Resell/Resources/Assets.xcassets/handmade.imageset/Contents.json
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,23 +1,12 @@ | ||
| { | ||
| "images": [ | ||
| "images" : [ | ||
| { | ||
| "filename": "color palette and brush.png", | ||
| "idiom": "universal", | ||
| "scale": "1x" | ||
| }, | ||
| { | ||
| "filename": "color palette and brush2.png", | ||
| "idiom": "universal", | ||
| "scale": "2x" | ||
| }, | ||
| { | ||
| "filename": "color palette and brush3.png", | ||
| "idiom": "universal", | ||
| "scale": "3x" | ||
| "filename" : "Wall Picture Frame - Iconly Pro.svg", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info": { | ||
| "author": "xcode", | ||
| "version": 1 | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } | ||
| } |
Binary file removed
BIN
-3.83 KB
Resell/Resources/Assets.xcassets/handmade.imageset/color palette and brush.png
Diff not rendered.
25 changes: 7 additions & 18 deletions
25
Resell/Resources/Assets.xcassets/school.imageset/Contents.json
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,23 +1,12 @@ | ||
| { | ||
| "images": [ | ||
| "images" : [ | ||
| { | ||
| "filename": "pencil case.png", | ||
| "idiom": "universal", | ||
| "scale": "1x" | ||
| }, | ||
| { | ||
| "filename": "pencil case2.png", | ||
| "idiom": "universal", | ||
| "scale": "2x" | ||
| }, | ||
| { | ||
| "filename": "pencil case3.png", | ||
| "idiom": "universal", | ||
| "scale": "3x" | ||
| "filename" : "School Backpack - Iconly Pro.svg", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info": { | ||
| "author": "xcode", | ||
| "version": 1 | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } | ||
| } |
Diff not rendered.
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make these two constants