[lcenavigationview-adoption] Fix black nav bar background, add Cart title wrap

setNavigationBarBackgroundColor was never called on the 15 screens adopted in 3456184, so it stayed at the default .clear and the real window background (black) showed through. Set it to AppColors.backgroundLight on all of them, matching each screen's own actual content background. Also wraps CartView's title in LCENavigationView for consistency with the rest of the app - no setLeftButton since Cart is a tab root, no back button needed. The other reported bug (empty right-button slot rendering a visible glass circle) is fixed in LCEssentials itself (separate repo, commit 8b0f650 on fix/navigation/liquid-glass-button-chrome) but won't take visual effect here until that's published and this repo's Package.resolved is bumped to point at it.
2026-08-24 14:50:46 -03:00
parent afa5b87da0
commit 18497b017a
16 changed files with 28 additions and 6 deletions
--- a/PediFoods/Views/Auth/LegalViews.swift
+++ b/PediFoods/Views/Auth/LegalViews.swift
@@ -77,6 +77,7 @@ private struct LegalDocumentScreen: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text(headerTitle).font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
    }

    private var content: some View {
--- a/PediFoods/Views/Main/AddAddressFormView.swift
+++ b/PediFoods/Views/Main/AddAddressFormView.swift
@@ -39,6 +39,7 @@ struct AddAddressFormView: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text(existingAddress == nil ? "Novo endereço" : "Editar endereço").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
    }

    private var content: some View {
--- a/PediFoods/Views/Main/AddCardFormView.swift
+++ b/PediFoods/Views/Main/AddCardFormView.swift
@@ -61,6 +61,7 @@ struct AddCardFormView: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text("Novo Cartão").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
    }

    private var content: some View {
--- a/PediFoods/Views/Main/AddressesView.swift
+++ b/PediFoods/Views/Main/AddressesView.swift
@@ -25,6 +25,7 @@ struct AddressesView: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text("Meus Endereços").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
    }

    private var content: some View {
--- a/PediFoods/Views/Main/CartView.swift
+++ b/PediFoods/Views/Main/CartView.swift
@@ -1,5 +1,8 @@
 import Foundation
 import SwiftUI
+#if canImport(LCEssentials)
+import LCEssentials
+#endif

 struct CartView: View {
    @Binding var appState: AppState
@@ -13,14 +16,16 @@ struct CartView: View {
    @State var isLoadingDeliveryFee = false

    var body: some View {
+        LCENavigationView {
+            content
+        }
+        .setTitle(text: Text("Meu Carrinho").font(AppTypography.heading1).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
+    }
+
+    private var content: some View {
        ScrollView(showsIndicators: false) {
            VStack(spacing: 16) {
-                Text("Meu Carrinho")
-                    .font(AppTypography.heading1)
-                    .foregroundStyle(AppColors.textPrimary)
-                    .frame(maxWidth: .infinity, alignment: .center)
-                    .padding(.top, 20)
-
                if appState.cart.items.isEmpty {
                    VStack(spacing: 10) {
                        Text("Seu carrinho está vazio")
--- a/PediFoods/Views/Main/CheckoutView.swift
+++ b/PediFoods/Views/Main/CheckoutView.swift
@@ -114,6 +114,7 @@ struct CheckoutView: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text("Finalizar Pedido").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
        .appBottomSafeAreaInset {
            bottomBar
        }
@@ -722,6 +723,7 @@ struct PaymentPixView: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text("Pagamento via PIX").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
        .sheet(isPresented: $showChangePaymentSheet) {
            ChangePaymentSheet(
                pixContext: currentContext,
--- a/PediFoods/Views/Main/OrderDetailsView.swift
+++ b/PediFoods/Views/Main/OrderDetailsView.swift
@@ -23,6 +23,7 @@ struct OrderDetailsView: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text("Detalhes do Pedido").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
    }

    private var content: some View {
--- a/PediFoods/Views/Main/OrderTrackingView.swift
+++ b/PediFoods/Views/Main/OrderTrackingView.swift
@@ -43,6 +43,7 @@ struct OrderTrackingView: View {
            }
        }
        .setTitle(text: Text("Pedido \(displayOrderTitle)").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
        .navigationDestination(item: $reviewDraft) { draft in
            MyReviewsView(initialOrder: draft)
        }
--- a/PediFoods/Views/Main/OrdersView.swift
+++ b/PediFoods/Views/Main/OrdersView.swift
@@ -22,6 +22,7 @@ struct OrdersView: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text("Meus Pedidos").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
    }

    private var content: some View {
--- a/PediFoods/Views/Main/PizzaFlavorAddonsSheet.swift
+++ b/PediFoods/Views/Main/PizzaFlavorAddonsSheet.swift
@@ -16,6 +16,7 @@ struct PizzaFlavorAddonsSheet: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text("Adicionais").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
    }

    private var content: some View {
--- a/PediFoods/Views/Main/PizzaProductDetailSheet.swift
+++ b/PediFoods/Views/Main/PizzaProductDetailSheet.swift
@@ -224,6 +224,7 @@ struct PizzaProductDetailSheet: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text("Monte sua pizza").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
    }

    private var content: some View {
--- a/PediFoods/Views/Main/ProductDetailSheet.swift
+++ b/PediFoods/Views/Main/ProductDetailSheet.swift
@@ -78,6 +78,7 @@ struct ProductDetailSheet: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text("Detalhes").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
    }

    private var content: some View {
--- a/PediFoods/Views/Main/PublicLocationPickerView.swift
+++ b/PediFoods/Views/Main/PublicLocationPickerView.swift
@@ -36,6 +36,7 @@ struct PublicLocationPickerView: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { back() }
        .setTitle(text: Text(step == .state ? "Escolha seu estado" : "Escolha sua cidade").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
    }

    private var content: some View {
--- a/PediFoods/Views/Main/ReviewsView.swift
+++ b/PediFoods/Views/Main/ReviewsView.swift
@@ -36,6 +36,7 @@ struct MyReviewsView: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text("Minhas Avaliações").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
        .navigationDestination(item: $selectedDraft) { draft in
            OrderReviewView(draft: draft) {
                Task { await loadReviewsFromBackend(forceRefresh: true) }
@@ -447,6 +448,7 @@ struct OrderReviewView: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text("Avaliar Pedido").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
    }

    private var content: some View {
--- a/PediFoods/Views/Main/SavedCardsView.swift
+++ b/PediFoods/Views/Main/SavedCardsView.swift
@@ -23,6 +23,7 @@ struct SavedCardsView: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text("Meus Cartões").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
    }

    private var content: some View {
--- a/PediFoods/Views/Main/UserProfileView.swift
+++ b/PediFoods/Views/Main/UserProfileView.swift
@@ -34,6 +34,7 @@ struct UserProfileView: View {
        }
        .setLeftButton(image: AnyView(AppBackButtonIcon())) { dismiss() }
        .setTitle(text: Text("Meu Perfil").font(AppTypography.heading2).foregroundStyle(AppColors.textPrimary))
+        .setNavigationBarBackgroundColor(AppColors.backgroundLight)
    }

    private var content: some View {