fix(android): resolve color parser and resource bundle resolution issues
This commit is contained in:
@@ -95,12 +95,21 @@ struct FeaturedStoreCard: View {
|
|||||||
|
|
||||||
private var storeIconPlaceholder: some View {
|
private var storeIconPlaceholder: some View {
|
||||||
ZStack {
|
ZStack {
|
||||||
|
#if os(Android)
|
||||||
|
Image("placeholder-product", bundle: .module)
|
||||||
|
.resizable()
|
||||||
|
.scaledToFill()
|
||||||
|
.opacity(0.7)
|
||||||
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||||
|
.clipped()
|
||||||
|
#else
|
||||||
Image("placeholder-product")
|
Image("placeholder-product")
|
||||||
.resizable()
|
.resizable()
|
||||||
.scaledToFill()
|
.scaledToFill()
|
||||||
.opacity(0.7)
|
.opacity(0.7)
|
||||||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||||
.clipped()
|
.clipped()
|
||||||
|
#endif
|
||||||
|
|
||||||
Circle()
|
Circle()
|
||||||
.fill(AppColors.surface.opacity(0.92))
|
.fill(AppColors.surface.opacity(0.92))
|
||||||
|
|||||||
@@ -103,7 +103,9 @@ extension Color {
|
|||||||
init(hex: String, alpha: Double = 1.0) {
|
init(hex: String, alpha: Double = 1.0) {
|
||||||
let cleaned = hex.trimmingCharacters(in: CharacterSet.alphanumerics.inverted)
|
let cleaned = hex.trimmingCharacters(in: CharacterSet.alphanumerics.inverted)
|
||||||
var int: UInt64 = 0
|
var int: UInt64 = 0
|
||||||
Scanner(string: cleaned).scanHexInt64(&int)
|
if let val = UInt64(cleaned, radix: 16) {
|
||||||
|
int = val
|
||||||
|
}
|
||||||
|
|
||||||
let r, g, b: UInt64
|
let r, g, b: UInt64
|
||||||
switch cleaned.count {
|
switch cleaned.count {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ struct LoginEmailView: View {
|
|||||||
|
|
||||||
@ViewBuilder private var logoImage: some View {
|
@ViewBuilder private var logoImage: some View {
|
||||||
#if os(Android)
|
#if os(Android)
|
||||||
SwiftUI.Image("pedifoods")
|
SwiftUI.Image("pedifoods", bundle: .module)
|
||||||
.resizable()
|
.resizable()
|
||||||
#else
|
#else
|
||||||
SwiftUI.Image("pedifoods")
|
SwiftUI.Image("pedifoods")
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ struct LoginView: View {
|
|||||||
|
|
||||||
@ViewBuilder private var logoImage: some View {
|
@ViewBuilder private var logoImage: some View {
|
||||||
#if os(Android)
|
#if os(Android)
|
||||||
SwiftUI.Image("pedifoods")
|
SwiftUI.Image("pedifoods", bundle: .module)
|
||||||
.resizable()
|
.resizable()
|
||||||
#else
|
#else
|
||||||
SwiftUI.Image("pedifoods")
|
SwiftUI.Image("pedifoods")
|
||||||
@@ -26,7 +26,7 @@ struct LoginView: View {
|
|||||||
|
|
||||||
@ViewBuilder private var pinHeroImage: some View {
|
@ViewBuilder private var pinHeroImage: some View {
|
||||||
#if os(Android)
|
#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()
|
.resizable()
|
||||||
#else
|
#else
|
||||||
SwiftUI.Image("pin_image_app")
|
SwiftUI.Image("pin_image_app")
|
||||||
|
|||||||
@@ -25,11 +25,19 @@ struct OtpView: View {
|
|||||||
var body: some View {
|
var body: some View {
|
||||||
ScrollView {
|
ScrollView {
|
||||||
VStack(spacing: 0) {
|
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")
|
SwiftUI.Image("pedifoods")
|
||||||
.resizable()
|
.resizable()
|
||||||
.scaledToFit()
|
.scaledToFit()
|
||||||
.frame(width: 74, height: 74)
|
.frame(width: 74, height: 74)
|
||||||
.padding(.top, 140)
|
.padding(.top, 140)
|
||||||
|
#endif
|
||||||
|
|
||||||
Text("Verificação")
|
Text("Verificação")
|
||||||
.font(AppTypography.heading1)
|
.font(AppTypography.heading1)
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ struct RegistrationView: View {
|
|||||||
|
|
||||||
@ViewBuilder private var logoImage: some View {
|
@ViewBuilder private var logoImage: some View {
|
||||||
#if os(Android)
|
#if os(Android)
|
||||||
SwiftUI.Image("pedifoods")
|
SwiftUI.Image("pedifoods", bundle: .module)
|
||||||
.resizable()
|
.resizable()
|
||||||
#else
|
#else
|
||||||
SwiftUI.Image("pedifoods")
|
SwiftUI.Image("pedifoods")
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ struct LaunchSplashView: View {
|
|||||||
|
|
||||||
@ViewBuilder var splashLogo: some View {
|
@ViewBuilder var splashLogo: some View {
|
||||||
#if os(Android)
|
#if os(Android)
|
||||||
SwiftUI.Image("pedifoods")
|
SwiftUI.Image("pedifoods", bundle: .module)
|
||||||
.resizable()
|
.resizable()
|
||||||
#else
|
#else
|
||||||
SwiftUI.Image("pedifoods")
|
SwiftUI.Image("pedifoods")
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ struct AddAddressFormView: View {
|
|||||||
|
|
||||||
@ViewBuilder private var logoImage: some View {
|
@ViewBuilder private var logoImage: some View {
|
||||||
#if os(Android)
|
#if os(Android)
|
||||||
SwiftUI.Image("pedifoods")
|
SwiftUI.Image("pedifoods", bundle: .module)
|
||||||
.resizable()
|
.resizable()
|
||||||
#else
|
#else
|
||||||
SwiftUI.Image("pedifoods")
|
SwiftUI.Image("pedifoods")
|
||||||
|
|||||||
@@ -222,15 +222,29 @@ struct OrderTrackingView: View {
|
|||||||
|
|
||||||
Group {
|
Group {
|
||||||
if hasTrackingImage {
|
if hasTrackingImage {
|
||||||
|
#if os(Android)
|
||||||
|
Image(trackingImageName, bundle: .module)
|
||||||
|
.renderingMode(.original)
|
||||||
|
.resizable()
|
||||||
|
.scaledToFit()
|
||||||
|
#else
|
||||||
Image(trackingImageName)
|
Image(trackingImageName)
|
||||||
.renderingMode(.original)
|
.renderingMode(.original)
|
||||||
.resizable()
|
.resizable()
|
||||||
.scaledToFit()
|
.scaledToFit()
|
||||||
|
#endif
|
||||||
} else if hasPlaceholderProductImage {
|
} else if hasPlaceholderProductImage {
|
||||||
|
#if os(Android)
|
||||||
|
Image("placeholder-product", bundle: .module)
|
||||||
|
.renderingMode(.original)
|
||||||
|
.resizable()
|
||||||
|
.scaledToFit()
|
||||||
|
#else
|
||||||
Image("placeholder-product")
|
Image("placeholder-product")
|
||||||
.renderingMode(.original)
|
.renderingMode(.original)
|
||||||
.resizable()
|
.resizable()
|
||||||
.scaledToFit()
|
.scaledToFit()
|
||||||
|
#endif
|
||||||
} else {
|
} else {
|
||||||
ZStack {
|
ZStack {
|
||||||
Color.black.opacity(0.08)
|
Color.black.opacity(0.08)
|
||||||
|
|||||||
Reference in New Issue
Block a user