Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Resell/Resources/Assets.xcassets/Active.imageset/Contents.json
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.
12 changes: 12 additions & 0 deletions Resell/Resources/Assets.xcassets/Household.imageset/Contents.json
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.
25 changes: 7 additions & 18 deletions Resell/Resources/Assets.xcassets/Other.imageset/Contents.json
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 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.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
25 changes: 7 additions & 18 deletions Resell/Resources/Assets.xcassets/books.imageset/Contents.json
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.
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 Resell/Resources/Assets.xcassets/clothing.imageset/Contents.json
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
}
}
}
Diff not rendered.
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
}
}
}
Diff not rendered.
15 changes: 2 additions & 13 deletions Resell/Resources/Assets.xcassets/filters.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
{
"images" : [
{
"filename" : "rivet-icons_filter 1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Group 66.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "rivet.png",
"idiom" : "universal",
"scale" : "3x"
"filename" : "Icons List Filter.svg",
"idiom" : "universal"
}
],
"info" : {
Expand Down
Diff not rendered.
Diff not rendered.
Diff not rendered.
25 changes: 7 additions & 18 deletions Resell/Resources/Assets.xcassets/handmade.imageset/Contents.json
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
}
}
}
Diff not rendered.
25 changes: 7 additions & 18 deletions Resell/Resources/Assets.xcassets/school.imageset/Contents.json
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.
7 changes: 4 additions & 3 deletions Resell/Utils/Constants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ struct Constants {
static let inactiveGray = Color(red: 190/255, green: 190/255, blue: 190/255)
static let purpleWash = Color(red: 250/255, green: 247/255, blue: 255/255)
static let resellPurple = Color(red: 158/255, green: 112/255, blue: 246/255)
static let tertiaryGray = Color(red: 45/255, green: 45/255, blue: 45/255)
static let secondaryGray = Color(red: 77/255, green: 77/255, blue: 77/255)
static let stroke = Color(red: 214/255, green: 214/255, blue: 214/255)
static let tint = Color(red: 0/255, green: 0/255, blue: 0/255, opacity: 20/100)
Expand Down Expand Up @@ -122,10 +123,10 @@ struct Constants {
FilterCategory(id: 2, title: "Books", color: Constants.Colors.filterGreen) ,
FilterCategory(id: 3, title: "School", color: Constants.Colors.filterLightGreen),
FilterCategory(id: 4, title: "Electronics", color: Constants.Colors.filterPink),
FilterCategory(id: 5, title: "Household"),
FilterCategory(id: 5, title: "Household", color: Constants.Colors.purpleWash),
FilterCategory(id: 6, title: "Handmade", color: Constants.Colors.filterYellow),
FilterCategory(id: 7, title: "Sports & Outdoors", color: Constants.Colors.filterBlue),
FilterCategory(id: 8, title: "Other")
FilterCategory(id: 7, title: "Active", color: Constants.Colors.filterBlue),
FilterCategory(id: 8, title: "Other", color: Constants.Colors.filterGray)
]

static let notificationFilters = [
Expand Down
14 changes: 4 additions & 10 deletions Resell/Views/Components/FilterButton.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,10 @@ struct CircularFilterButton: View {

var body: some View {
Button(action: action, label: {
ZStack{
Circle()
.frame(width: 80, height: 80)
.foregroundStyle((filter.color?.opacity(0.5)) ?? Constants.Colors.filterGray)

Image(filter.title)
.resizable()
.scaledToFit()
.frame(width: 56, height: 56)
}
Image(filter.title)
.resizable()
.scaledToFit()
.frame(width: 72, height: 72)
})
}
}
Expand Down
19 changes: 18 additions & 1 deletion Resell/Views/Components/RangeSlider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,24 @@ struct RangeSlider: View {
.fill(Constants.Colors.resellPurple.opacity(0.2))
.frame(width: trackWidth, height: 4)
.cornerRadius(4)


// Active range between the two handles.
let lowX = position(for: lowValue) + handleDiameter / 2

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make these two constants

let highX = position(for: highValue) + handleDiameter / 2
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)
Expand Down
Loading