diff --git a/FeelsWidget/FeelsWidget.swift b/FeelsWidget/FeelsWidget.swift index 4fa7935..707de57 100644 --- a/FeelsWidget/FeelsWidget.swift +++ b/FeelsWidget/FeelsWidget.swift @@ -267,11 +267,9 @@ struct SmallGraphicWidgetView: View { IconView(iconViewModel: IconViewModel(backgroundImage: first.graphic, bgColor: first.color, bgOverlayColor: first.secondaryColor, - centerImage: first.graphic), - isPreview: true) + centerImage: first.graphic)) } else { - IconView(iconViewModel: IconViewModel.great, - isPreview: false) + IconView(iconViewModel: IconViewModel.great) } } } diff --git a/Shared/Models/MoodImagable.swift b/Shared/Models/MoodImagable.swift index 97ecb90..b10b6ab 100644 --- a/Shared/Models/MoodImagable.swift +++ b/Shared/Models/MoodImagable.swift @@ -75,9 +75,9 @@ final class EmojiMoodImages: MoodImagable { case .great: return Image(uiImage: "😀".textToImage()!) case .missing: - return Image(uiImage: "x".textToImage()!) + return Image(uiImage: "X".textToImage()!) case .placeholder: - return Image(uiImage: "x".textToImage()!) + return Image(uiImage: "X".textToImage()!) } } } @@ -96,9 +96,9 @@ final class HandEmojiMoodImages: MoodImagable { case .great: return Image(uiImage: "🙏".textToImage()!) case .missing: - return Image(uiImage: "x".textToImage()!) + return Image(uiImage: "X".textToImage()!) case .placeholder: - return Image(uiImage: "x".textToImage()!) + return Image(uiImage: "X".textToImage()!) } } } diff --git a/Shared/views/CustomIcon/IconView.swift b/Shared/views/CustomIcon/IconView.swift index 98509d9..b0003bc 100644 --- a/Shared/views/CustomIcon/IconView.swift +++ b/Shared/views/CustomIcon/IconView.swift @@ -11,28 +11,6 @@ struct IconView: View { @State public var iconViewModel: IconViewModel private let facePercSize = 0.6 - public let isPreview: Bool - - private var gridXOffset: CGFloat { - if isPreview { - return CGFloat(0) - } - return CGFloat(6) - } - - private var gridYOffset: CGFloat { - if isPreview { - return CGFloat(0) - } - return CGFloat(-8) - } - - private var entireFuckingViewOffset: CGFloat { - if isPreview { - return CGFloat(0) - } - return CGFloat(25) - } let columns = [ GridItem(.flexible(minimum: 1, maximum: 100), spacing: 1), @@ -60,7 +38,7 @@ struct IconView: View { ForEach(iconViewModel.background, id: \.self.1) { (bgOption, uuid) in bgOption .resizable() - .aspectRatio(1, contentMode: .fill) + .aspectRatio(contentMode: .fill) .foregroundColor(iconViewModel.bgOverlayColor) } } @@ -76,7 +54,9 @@ struct IconView: View { .frame(width: geo.size.width*facePercSize, height: geo.size.height*facePercSize, alignment: .center) - .position(x: geo.size.width/2, y: geo.size.height/2) + .alignmentGuide(.top, computeValue: { _ in + return geo.size.width/2 + }) iconViewModel.centerImage .resizable() @@ -85,11 +65,13 @@ struct IconView: View { height: geo.size.height*facePercSize, alignment: .center) .foregroundColor(iconViewModel.bgOverlayColor) - .position(x: geo.size.width/2, y: geo.size.height/2) + .alignmentGuide(.top, computeValue: { _ in + return geo.size.width/2 + }) } .position(x: geo.size.width/2, - y: geo.size.height/2 - entireFuckingViewOffset) + y: geo.size.height/2) } } } @@ -97,7 +79,7 @@ struct IconView: View { struct IconView_Previews: PreviewProvider { static var previews: some View { Group { - IconView(iconViewModel: IconViewModel.great, isPreview: false) + IconView(iconViewModel: IconViewModel.great) .frame(width: 256, height: 256, alignment: .center) // IconView(iconViewModel: IconViewModel.good, isPreview: true) diff --git a/Shared/views/CustomWidget/CustomWidgetView.swift b/Shared/views/CustomWidget/CustomWidgetView.swift index 0547b1d..9ccb531 100644 --- a/Shared/views/CustomWidget/CustomWidgetView.swift +++ b/Shared/views/CustomWidget/CustomWidgetView.swift @@ -54,7 +54,9 @@ struct CustomWidgetView: View { .frame(width: geo.size.width*facePercSize, height: geo.size.height*facePercSize, alignment: .center) - .position(x: geo.size.width/2, y: geo.size.height/2) + .alignmentGuide(.top, computeValue: { _ in + return geo.size.width/2 + }) customWidgetModel.leftEye.image .resizable() @@ -63,7 +65,7 @@ struct CustomWidgetView: View { height: geo.size.height*0.12, alignment: .center) .position(x: geo.size.width*0.4, - y: geo.size.height*0.4) + y: geo.size.height*0.45) .foregroundColor(customWidgetModel.leftEyeColor) customWidgetModel.rightEye.image @@ -73,7 +75,7 @@ struct CustomWidgetView: View { height: geo.size.height*0.12, alignment: .center) .position(x: geo.size.width*0.6, - y: geo.size.height*0.4) + y: geo.size.height*0.45) .foregroundColor(customWidgetModel.rightEyeColor) customWidgetModel.mouth.image @@ -83,7 +85,7 @@ struct CustomWidgetView: View { height: geo.size.height*0.12, alignment: .center) .position(x: geo.size.width*0.5, - y: geo.size.height*0.59) + y: geo.size.height*0.65) .foregroundColor(customWidgetModel.mouthColor) } .position(x: geo.size.width/2,