fix(android): resolve color parser and resource bundle resolution issues

This commit is contained in:
Daniel Arantes Loverde
2026-05-27 09:55:00 -03:00
parent 0e6206f899
commit 68864ee21a
9 changed files with 40 additions and 7 deletions

View File

@@ -95,12 +95,21 @@ struct FeaturedStoreCard: View {
private var storeIconPlaceholder: some View {
ZStack {
#if os(Android)
Image("placeholder-product", bundle: .module)
.resizable()
.scaledToFill()
.opacity(0.7)
.frame(maxWidth: .infinity, maxHeight: .infinity)
.clipped()
#else
Image("placeholder-product")
.resizable()
.scaledToFill()
.opacity(0.7)
.frame(maxWidth: .infinity, maxHeight: .infinity)
.clipped()
#endif
Circle()
.fill(AppColors.surface.opacity(0.92))

View File

@@ -103,7 +103,9 @@ extension Color {
init(hex: String, alpha: Double = 1.0) {
let cleaned = hex.trimmingCharacters(in: CharacterSet.alphanumerics.inverted)
var int: UInt64 = 0
Scanner(string: cleaned).scanHexInt64(&int)
if let val = UInt64(cleaned, radix: 16) {
int = val
}
let r, g, b: UInt64
switch cleaned.count {

View File

@@ -15,7 +15,7 @@ struct LoginEmailView: View {
@ViewBuilder private var logoImage: some View {
#if os(Android)
SwiftUI.Image("pedifoods")
SwiftUI.Image("pedifoods", bundle: .module)
.resizable()
#else
SwiftUI.Image("pedifoods")

View File

@@ -16,7 +16,7 @@ struct LoginView: View {
@ViewBuilder private var logoImage: some View {
#if os(Android)
SwiftUI.Image("pedifoods")
SwiftUI.Image("pedifoods", bundle: .module)
.resizable()
#else
SwiftUI.Image("pedifoods")
@@ -26,7 +26,7 @@ struct LoginView: View {
@ViewBuilder private var pinHeroImage: some View {
#if os(Android)
SwiftUI.Image(colorScheme == .dark ? "pin_image_app_dark" : "pin_image_app")
SwiftUI.Image(colorScheme == .dark ? "pin_image_app_dark" : "pin_image_app", bundle: .module)
.resizable()
#else
SwiftUI.Image("pin_image_app")

View File

@@ -25,11 +25,19 @@ struct OtpView: View {
var body: some View {
ScrollView {
VStack(spacing: 0) {
#if os(Android)
SwiftUI.Image("pedifoods", bundle: .module)
.resizable()
.scaledToFit()
.frame(width: 74, height: 74)
.padding(.top, 140)
#else
SwiftUI.Image("pedifoods")
.resizable()
.scaledToFit()
.frame(width: 74, height: 74)
.padding(.top, 140)
#endif
Text("Verificação")
.font(AppTypography.heading1)

View File

@@ -19,7 +19,7 @@ struct RegistrationView: View {
@ViewBuilder private var logoImage: some View {
#if os(Android)
SwiftUI.Image("pedifoods")
SwiftUI.Image("pedifoods", bundle: .module)
.resizable()
#else
SwiftUI.Image("pedifoods")

View File

@@ -37,7 +37,7 @@ struct LaunchSplashView: View {
@ViewBuilder var splashLogo: some View {
#if os(Android)
SwiftUI.Image("pedifoods")
SwiftUI.Image("pedifoods", bundle: .module)
.resizable()
#else
SwiftUI.Image("pedifoods")

View File

@@ -33,7 +33,7 @@ struct AddAddressFormView: View {
@ViewBuilder private var logoImage: some View {
#if os(Android)
SwiftUI.Image("pedifoods")
SwiftUI.Image("pedifoods", bundle: .module)
.resizable()
#else
SwiftUI.Image("pedifoods")

View File

@@ -222,15 +222,29 @@ struct OrderTrackingView: View {
Group {
if hasTrackingImage {
#if os(Android)
Image(trackingImageName, bundle: .module)
.renderingMode(.original)
.resizable()
.scaledToFit()
#else
Image(trackingImageName)
.renderingMode(.original)
.resizable()
.scaledToFit()
#endif
} else if hasPlaceholderProductImage {
#if os(Android)
Image("placeholder-product", bundle: .module)
.renderingMode(.original)
.resizable()
.scaledToFit()
#else
Image("placeholder-product")
.renderingMode(.original)
.resizable()
.scaledToFit()
#endif
} else {
ZStack {
Color.black.opacity(0.08)