Skip to content
Draft
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
4 changes: 2 additions & 2 deletions BugBazaar/BugBazaarApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ struct MainTabsView: View {

TabBarView(selected: $router.tab)
}
.background(Theme.paperWhite)
.background(Theme.appBackground)
}
}

Expand Down Expand Up @@ -114,7 +114,7 @@ struct TabBarView: View {
.padding(.top, 8)
.padding(.horizontal, 8)
.padding(.bottom, 20)
.background(Theme.paperWhite)
.background(Theme.appBackground)
.overlay(alignment: .top) {
Rectangle().fill(Color.black.opacity(0.1)).frame(height: 1)
}
Expand Down
2 changes: 1 addition & 1 deletion BugBazaar/Components/HeaderView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct HeaderView: View {
}
.padding(.horizontal, Spacing.m)
.padding(.vertical, Spacing.m)
.background(Theme.paperWhite.opacity(0.95))
.background(Theme.appBackground.opacity(0.95))
.overlay(alignment: .bottom) {
Rectangle().fill(Theme.hairline).frame(height: 1)
}
Expand Down
2 changes: 1 addition & 1 deletion BugBazaar/Screens/AccountView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ struct AccountView: View {
.padding(.bottom, Spacing.xl + 20)
}
}
.background(Theme.paperWhite)
.background(Theme.appBackground)
.alert(demoAlert ?? "", isPresented: Binding(
get: { demoAlert != nil },
set: { if !$0 { demoAlert = nil } }
Expand Down
4 changes: 2 additions & 2 deletions BugBazaar/Screens/CartView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ struct CartView: View {
filledState
}
}
.background(Theme.paperWhite)
.background(Theme.appBackground)
}

private var emptyState: some View {
Expand Down Expand Up @@ -93,7 +93,7 @@ struct CartView: View {
.accessibilityIdentifier("checkout-button")
}
.padding(Spacing.m)
.background(Theme.paperWhite)
.background(Theme.appBackground)
.overlay(alignment: .top) {
Rectangle().fill(Theme.hairline).frame(height: 1)
}
Expand Down
4 changes: 2 additions & 2 deletions BugBazaar/Screens/CheckoutView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ struct CheckoutView: View {

footer
}
.background(Theme.paperWhite)
.background(Theme.appBackground)
}

// MARK: Steps
Expand Down Expand Up @@ -223,7 +223,7 @@ struct CheckoutView: View {
.accessibilityIdentifier("checkout-footer-button")
}
.padding(Spacing.m)
.background(Theme.paperWhite)
.background(Theme.appBackground)
.overlay(alignment: .top) {
Rectangle().fill(Theme.hairline).frame(height: 1)
}
Expand Down
2 changes: 1 addition & 1 deletion BugBazaar/Screens/ConfirmationView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ struct ConfirmationView: View {
}
.padding(Spacing.m)
}
.background(Theme.paperWhite)
.background(Theme.appBackground)
.navigationBarBackButtonHidden(true)
.onAppear {
withAnimation(.spring(response: 0.45, dampingFraction: 0.6)) {
Expand Down
2 changes: 1 addition & 1 deletion BugBazaar/Screens/OrderDetailView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct OrderDetailView: View {
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
}
.background(Theme.paperWhite)
.background(Theme.appBackground)
}

private func statusColor(_ status: OrderStatus) -> Color {
Expand Down
4 changes: 2 additions & 2 deletions BugBazaar/Screens/ProductDetailView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct ProductDetailView: View {
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
}
.background(Theme.paperWhite)
.background(Theme.appBackground)
}

private func detail(_ product: Product) -> some View {
Expand Down Expand Up @@ -153,7 +153,7 @@ struct ProductDetailView: View {
.accessibilityIdentifier("add-to-cart")
}
.padding(Spacing.m)
.background(Theme.paperWhite)
.background(Theme.appBackground)
.overlay(alignment: .top) {
Rectangle().fill(Theme.hairline).frame(height: 1)
}
Expand Down
2 changes: 1 addition & 1 deletion BugBazaar/Screens/SearchView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ struct SearchView: View {
.padding(.bottom, Spacing.xl)
}
}
.background(Theme.paperWhite)
.background(Theme.appBackground)
}

private var emptyState: some View {
Expand Down
2 changes: 1 addition & 1 deletion BugBazaar/Screens/ShopView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ struct ShopView: View {
.padding(.bottom, Spacing.xl)
}
}
.background(Theme.paperWhite)
.background(Theme.appBackground)
}
}
2 changes: 1 addition & 1 deletion BugBazaar/Screens/SpecimensView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct SpecimensView: View {
.padding(.bottom, Spacing.xl)
}
}
.background(Theme.paperWhite)
.background(Theme.appBackground)
}

private var statsRow: some View {
Expand Down
1 change: 1 addition & 0 deletions BugBazaar/Theme.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ enum Theme {
static let mangoOrange = Color(hex: 0x008000)
static let mangoYellow = Color(hex: 0xFFD500)
static let inkBlack = Color(hex: 0x080808)
static let appBackground = Color(hex: 0xFF0000)
static let paperWhite = Color(hex: 0xFCFCFC)
static let gray = Color(hex: 0x999999)
static let lightGray = Color(hex: 0xF0F0F0)
Expand Down