master merged

pedi-foods/Sources/PediFoods/Components/Buttons.swift

@@ -39,6 +39,7 @@ struct PrimaryButtonLabel: View {
             .frame(height: 56)
             .background(AppColors.primary)
             .clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
+            .labelStyle(.titleOnly)
     }
 }
 
@@ -58,7 +59,7 @@ struct SecondaryButton: View {
                     image
                 }
             }
-            .foregroundStyle(AppColors.textInverse)
+            .foregroundStyle(AppColors.textPrimary)
             .frame(maxWidth: fullWidth ? .infinity : nil)
             .frame(height: 56)
             .background(AppColors.secondary)

pedi-foods/Sources/PediFoods/Components/Inputs.swift

@@ -7,7 +7,7 @@ struct SearchField: View {
     var body: some View {
         HStack(spacing: 12) {
             Image(systemName: "magnifyingglass")
-                .foregroundStyle(AppColors.secondary)
+                .foregroundStyle(AppColors.primary)
             TextField(placeholder, text: $text)
                 .appNoAutoCap()
         }
@@ -17,7 +17,7 @@ struct SearchField: View {
         .clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
         .overlay(
             RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous)
-                .stroke(AppColors.secondary.opacity(0.15), lineWidth: 1)
+                .stroke(AppColors.primary.opacity(0.15), lineWidth: 1)
         )
     }
 }
@@ -30,14 +30,14 @@ struct PillButton: View {
         Text(title)
             .font(AppTypography.caption)
             .tracking(AppTypography.captionLetterSpacing)
-            .foregroundStyle(isActive ? AppColors.textInverse : AppColors.secondary)
+            .foregroundStyle(isActive ? AppColors.textInverse : AppColors.primary)
             .padding(.horizontal, 14)
             .padding(.vertical, 8)
             .background(isActive ? AppColors.primary : AppColors.backgroundLight)
             .clipShape(Capsule())
             .overlay(
                 Capsule()
-                    .stroke(AppColors.secondary.opacity(0.15), lineWidth: isActive ? 0 : 1)
+                    .stroke(AppColors.primary.opacity(0.15), lineWidth: isActive ? 0 : 1)
             )
     }
 }

pedi-foods/Sources/PediFoods/Components/SnackbarOverlay.swift

@@ -1,16 +1,9 @@
 import SwiftUI
 
 struct SnackbarOverlay: View {
-#if os(Android)
-    let center: SnackbarCenter
-#else
     @ObservedObject var center: SnackbarCenter
-#endif
 
     var body: some View {
-#if os(Android)
-        EmptyView()
-#else
         VStack {
             if let message = center.current {
                 HStack(spacing: 10) {
@@ -41,6 +34,5 @@ struct SnackbarOverlay: View {
         }
         .animation(.spring(response: 0.3, dampingFraction: 0.9), value: center.current?.id)
         .allowsHitTesting(center.current != nil)
-#endif
     }
 }

pedi-foods/Sources/PediFoods/Components/StoreCard.swift

@@ -120,6 +120,7 @@ struct FeaturedStoreCardModel: Identifiable {
     let rating: Double
     let reviews: String
     let distance: String
+    let deliveryFee: Double?
     let category: String
     let promoText: String?
     let isFavorite: Bool