Rename Sports & Outdoors to Active and swap category art for line icons #111
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
| 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 | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.
Binary file not shown.
Binary file not shown.
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.
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.
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 | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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" : [ | ||
| { | ||
| "filename" : "Air Humidifier - Iconly Pro.svg", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file not shown.
Binary file not shown.
Binary file not shown.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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" : [ | ||
| { | ||
| "filename" : "Open Book - Iconly Pro.svg", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } | ||
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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" : [ | ||
| { | ||
| "filename" : "Beige Jacket - Iconly Pro.svg", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,12 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "Old TV Basic - Iconly Pro.svg", | ||
| "idiom" : "universal" | ||
| } | ||
|
Comment on lines
+4
to
6
There was a problem hiding this comment. 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win 🔎 Supported by static analysis🏁 Script executed: set -eu
printf '%s\n' '--- affected files and paths ---'
git ls-files 'Resell/Resources/Assets.xcassets/*electronics*' 'Resell/Resources/Assets.xcassets/*Electronics*'
printf '%s\n' '--- lowercase manifest ---'
cat -n 'Resell/Resources/Assets.xcassets/electronics.imageset/Contents.json'
printf '%s\n' '--- uppercase manifest ---'
cat -n 'Resell/Resources/Assets.xcassets/Electronics.imageset/Contents.json' 2>/dev/null || true
printf '%s\n' '--- tracked files in both imagesets ---'
git ls-files 'Resell/Resources/Assets.xcassets/electronics.imageset/*' 'Resell/Resources/Assets.xcassets/Electronics.imageset/*'
printf '%s\n' '--- changed paths versus supplied PR base ---'
git diff --name-status 2a3bb90f96645a78629a6cc25445c7d8baa2998a ed3255d493bc4a58328f68275934a512b09aeac6 -- 'Resell/Resources/Assets.xcassets/*electronics*' 'Resell/Resources/Assets.xcassets/*Electronics*'
printf '%s\n' '--- electronics references in source/project files ---'
rg -n -i --glob '!*.svg' --glob '!*.png' 'electronics(\.imageset)?|Electronics' Resell . || trueRepository: cuappdev/resell-ios Length of output: 1727 🏁 Script executed: set -eu
printf '%s\n' '--- Constants around filter categories ---'
cat -n Resell/Utils/Constants.swift | sed -n '100,145p'
printf '%s\n' '--- image/resource lookup calls ---'
rg -n -i --glob '*.swift' 'Image\\(|UIImage|imageNamed|systemName|asset|filter|category' Resell | head -240
printf '%s\n' '--- category declarations and consumers ---'
rg -n -i --glob '*.swift' 'struct FilterCategory|class FilterCategory|enum FilterCategory|FilterCategory\\(|\\.title|category\\.title|filterCategory|filter\\.title' Resell | head -240
printf '%s\n' '--- asset catalog directory metadata ---'
find Resell/Resources/Assets.xcassets -maxdepth 2 -type f \( -path '*[Ee]lectronics*' -o -path '*electronics*' \) -print | sort
printf '%s\n' '--- project references to asset catalog ---'
rg -n 'Assets\\.xcassets|Resources' Resell.xcodeproj Resell 2>/dev/null | head -160Repository: cuappdev/resell-ios Length of output: 6523 🏁 Script executed: set -eu
printf '%s\n' '--- Swift image calls ---'
rg -n -F --glob '*.swift' 'Image(' Resell || true
rg -n -F --glob '*.swift' 'UIImage' Resell || true
rg -n -F --glob '*.swift' 'imageNamed' Resell || true
printf '%s\n' '--- Swift category/filter terms ---'
rg -n -i --glob '*.swift' 'FilterCategory|filterCategory|category.title|filter.title|filters' Resell | head -260
printf '%s\n' '--- likely filter UI files ---'
find Resell -type f -name '*.swift' -print | sort | while read -r f; do
if rg -qi -e 'FilterCategory|filter' "$f"; then printf '%s\n' "$f"; fi
done
printf '%s\n' '--- asset manifest names and image references ---'
rg -n -i --glob 'Contents*.json' 'filename|name|electronics|books|clothing|school' Resell/Resources/Assets.xcassets | head -260Repository: cuappdev/resell-ios Length of output: 41807 🏁 Script executed: set -eu
printf '%s\n' '--- FilterButton consumer ---'
cat -n Resell/Views/Components/FilterButton.swift | sed -n '1,75p'
printf '%s\n' '--- base asset paths ---'
git ls-tree -r --name-only 2a3bb90f96645a78629a6cc25445c7d8baa2998a -- Resell/Resources/Assets.xcassets | grep -E '/([Ee]lectronics|electronics)\\.imageset/' || true
printf '%s\n' '--- base/current exact manifests and files ---'
for rev in 2a3bb90f96645a78629a6cc25445c7d8baa2998a ed3255d493bc4a58328f68275934a512b09aeac6; do
printf '%s\n' \"REV $rev\"
git ls-tree -r --name-only \"$rev\" -- Resell/Resources/Assets.xcassets | grep -E '/([Ee]lectronics|electronics)\\.imageset/' || true
printf '%s\n' 'lowercase manifest:'
git show \"$rev:Resell/Resources/Assets.xcassets/electronics.imageset/Contents.json\" 2>/dev/null || true
printf '%s\n' 'uppercase canonical manifest:'
git show \"$rev:Resell/Resources/Assets.xcassets/Electronics.imageset/Contents.json\" 2>/dev/null || true
doneRepository: cuappdev/resell-ios Length of output: 2902 🌐 Web query:
💡 Result: <source_evidence> Citations:
🏁 Script executed: set -eu
printf '%s\n' '--- CircularFilterButton callers ---'
rg -n -F --glob '*.swift' 'CircularFilterButton' Resell || true
printf '%s\n' '--- Home filter/category rendering ---'
rg -n -F --glob '*.swift' 'FilterButton(' Resell || true
rg -n -F --glob '*.swift' 'Constants.filters' Resell || true
printf '%s\n' '--- relevant Home and filter source ---'
cat -n Resell/Views/Home/HomeView.swift | sed -n '1,95p'
cat -n Resell/Views/Home/FilterView.swift | sed -n '1,115p'Repository: cuappdev/resell-ios Length of output: 11366 Keep the electronics asset manifest and SVG in the same imageset.
Suggested fixdiff --git a/Resell/Resources/Assets.xcassets/electronics.imageset/Contents.json b/Resell/Resources/Assets.xcassets/Electronics.imageset/Contents.json
similarity index 100%
rename from Resell/Resources/Assets.xcassets/electronics.imageset/Contents.json
rename to Resell/Resources/Assets.xcassets/Electronics.imageset/Contents.json🤖 Prompt for AI Agents |
||
| ], | ||
| "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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,8 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "Icons List Filter.svg", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info" : { | ||
|
|
||
Diff not rendered.
Oops, something went wrong.
Diff not rendered.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,12 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "Wall Picture Frame - Iconly Pro.svg", | ||
| "idiom" : "universal" | ||
| } | ||
|
Comment on lines
+4
to
6
There was a problem hiding this comment. 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win 🔎 Supported by static analysis🏁 Script executed: cat 'Resell/Resources/Assets.xcassets/handmade.imageset/Contents.json'
find 'Resell/Resources/Assets.xcassets/handmade.imageset' -maxdepth 1 -type f -printRepository: cuappdev/resell-ios Length of output: 404 The manifest references 🤖 Prompt for AI Agents |
||
| ], | ||
| "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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,12 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "School Backpack - Iconly Pro.svg", | ||
| "idiom" : "universal" | ||
| } | ||
|
Comment on lines
+4
to
6
There was a problem hiding this comment. 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win 🔎 Supported by static analysis🏁 Script executed: #!/bin/bash
set -eu
printf '%s\n' '--- exact imageset files and manifests ---'
git ls-files 'Resell/Resources/Assets.xcassets/*chool.imageset/*'
for f in Resell/Resources/Assets.xcassets/school.imageset/Contents.json Resell/Resources/Assets.xcassets/School.imageset/Contents.json; do
if [ -f "$f" ]; then
echo "--- $f ---"
cat -n "$f"
fi
done
printf '%s\n' '--- school-related references ---'
rg -n -i --glob '!*.svg' --glob '!*.png' --glob '!*.jpg' --glob '!*.jpeg' 'school|School Backpack|pencil case' Resell . | head -200
printf '%s\n' '--- asset catalog declarations and project references ---'
rg -n -i 'Assets\.xcassets|school\.imageset|School\.imageset|imageNamed|Image\(' Resell --glob '*.pbxproj' --glob '*.swift' --glob '*.m' --glob '*.mm' --glob '*.storyboard' --glob '*.xib' --glob '*.json' --glob '*.plist' | head -250
printf '%s\n' '--- relevant paths in reviewed head ---'
git ls-tree -r --name-only ed3255d493bc4a58328f68275934a512b09aeac6 -- 'Resell/Resources/Assets.xcassets/*chool.imageset/*'Repository: cuappdev/resell-ios Length of output: 18156 🏁 Script executed: #!/bin/bash
set -eu
printf '%s\n' '--- FilterButton and School filter declaration ---'
cat -n Resell/Views/Components/FilterButton.swift | sed -n '1,100p'
cat -n Resell/Utils/Constants.swift | sed -n '112,132p'
printf '%s\n' '--- reviewed-head asset tree ---'
git ls-tree -r --name-only ed3255d493bc4a58328f68275934a512b09aeac6 -- 'Resell/Resources/Assets.xcassets' | grep -E '(^|/)([sS]chool\.imageset|Contents(\.json| 2\.json)|School Backpack)' || true
printf '%s\n' '--- base asset tree ---'
git ls-tree -r --name-only 2a3bb90f96645a78629a6cc25445c7d8baa2998a -- 'Resell/Resources/Assets.xcassets' | grep -E '(^|/)([sS]chool\.imageset|Contents(\.json| 2\.json)|School Backpack)' || true
printf '%s\n' '--- reviewed-head manifests ---'
for f in 'Resell/Resources/Assets.xcassets/school.imageset/Contents.json' 'Resell/Resources/Assets.xcassets/School.imageset/Contents 2.json'; do
echo "--- $f ---"
git show "ed3255d493bc4a58328f68275934a512b09aeac6:$f" 2>/dev/null | cat -n || true
done
printf '%s\n' '--- relevant diff summary ---'
git diff --name-status 2a3bb90f96645a78629a6cc25445c7d8baa2998a ed3255d493bc4a58328f68275934a512b09aeac6 -- 'Resell/Resources/Assets.xcassets/*chool.imageset/*'Repository: cuappdev/resell-ios Length of output: 15817 🌐 Web query:
💡 Result: <source_evidence> Citations:
🏁 Script executed: #!/bin/bash
set -eu
printf '%s\n' '--- CircularFilterButton usages ---'
rg -n -C 6 'CircularFilterButton|Constants\.filters|filters\b' Resell --glob '*.swift' | head -300
printf '%s\n' '--- candidate filter view ---'
if [ -f Resell/Views/Home/FilterView.swift ]; then
cat -n Resell/Views/Home/FilterView.swift | sed -n '1,180p'
fi
printf '%s\n' '--- asset catalog root manifest ---'
cat -n Resell/Resources/Assets.xcassets/Contents.json | sed -n '1,100p'Repository: cuappdev/resell-ios Length of output: 25623 🌐 Web query:
💡 Result: <source_evidence> Citations:
Keep the manifest with the
Suggested fix-Resell/Resources/Assets.xcassets/school.imageset/Contents.json
+Resell/Resources/Assets.xcassets/School.imageset/Contents.json🤖 Prompt for AI Agents |
||
| ], | ||
| "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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,17 +13,42 @@ struct RangeSlider: View { | |
| let range: ClosedRange<Double> | ||
| let step: Double = 5 // Define the step value | ||
|
|
||
|
|
||
| private let trackWidth: CGFloat = 344 | ||
| private let handleDiameter: CGFloat = 14 | ||
|
|
||
| private var lowX: CGFloat { | ||
| position(for: lowValue) + handleDiameter / 2 | ||
| } | ||
|
|
||
| private var highX: CGFloat { | ||
| position(for: highValue) + handleDiameter / 2 | ||
| } | ||
|
|
||
| var body: some View { | ||
| GeometryReader { geometry in | ||
|
There was a problem hiding this comment. same with this body this is way too big reference uplift codebase to see how cleanly separated it is: https://github.com/cuappdev/uplift-ios-swiftui/blob/main/Uplift/Views/HomeView.swift |
||
| ZStack(alignment: .leading) { | ||
| Rectangle() | ||
| .fill(Constants.Colors.resellPurple.opacity(0.2)) | ||
| .frame(width: trackWidth, height: 4) | ||
| .cornerRadius(4) | ||
|
|
||
| // Active range between the two handles. | ||
|
AdelynnWu marked this conversation as resolved.
|
||
|
|
||
| Rectangle() | ||
| .fill( | ||
| LinearGradient( | ||
| colors: [ | ||
| Constants.Colors.resellPurple.opacity(0.5), | ||
| Constants.Colors.resellPurple | ||
| ], | ||
| startPoint: .leading, | ||
| endPoint: .trailing | ||
| ) | ||
| ) | ||
| .frame(width: max(0, highX - lowX), height: 4) | ||
| .offset(x: lowX) | ||
|
|
||
| Circle() | ||
| .fill(Color.white) | ||
| .frame(width: handleDiameter, height: handleDiameter) | ||
|
|
||
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.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
🔎 Supported by static analysis
🏁 Script executed:
Repository: cuappdev/resell-ios
Length of output: 2484
🏁 Script executed:
Repository: cuappdev/resell-ios
Length of output: 40404
🏁 Script executed:
Repository: cuappdev/resell-ios
Length of output: 13947
🌐 Web query:
Apple asset catalogs imageset Contents.json case-sensitive asset name directory case official documentation💡 Result:
<source_evidence>
Citations:
Keep the SVG in the imageset with its manifest.
The reachable Books button passes
"Books"toImage. The changed manifest referencesOpen Book - Iconly Pro.svg, but that file is inBooks.imagesetwhile the manifest is inbooks.imageset. An image set requires itsContents.json, and the referenced file must be in that image set. This mismatch can prevent the Books icon from being packaged or resolved.Suggested fix
diff --git a/Resell/Resources/Assets.xcassets/Books.imageset/Open Book - Iconly Pro.svg b/Resell/Resources/Assets.xcassets/books.imageset/Open Book - Iconly Pro.svg similarity index 100% rename from Resell/Resources/Assets.xcassets/Books.imageset/Open Book - Iconly Pro.svg rename to Resell/Resources/Assets.xcassets/books.imageset/Open Book - Iconly Pro.svg🤖 Prompt for AI Agents