admin/Reflect
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spacing on custom icon widget

Browse Source 
create color extension for random
widget 512x512 ... 1024x1024 didn't work
clean up Icon Widget View
This commit is contained in:
Trey t
2022-02-13 23:23:58 -06:00
parent 649180dbb5
commit b8e1198c5b
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Shared/Random.swift
View File

@@ -145,3 +145,13 @@ extension Date {
return dates return dates
} }
} }
extension Color {
static func random() -> Self {
Self(
red: .random(in: 0...1),
green: .random(in: 0...1),
blue: .random(in: 0...1)
)
}
}

18
Shared/views/CreateIconView.swift
View File

@@ -55,17 +55,9 @@ struct CreateIconView: View {
} }
func createRandom() { func createRandom() {
customIcon.bgColor = Color( customIcon.bgColor = Color.random()
red: .random(in: 0...1), customIcon.innerColor = Color.random()
green: .random(in: 0...1), customIcon.bgOverlayColor = Color.random()
blue: .random(in: 0...1)
)
customIcon.innerColor = Color(
red: .random(in: 0...1),
green: .random(in: 0...1),
blue: .random(in: 0...1)
)
update(eye: .left, eyeOption: EyeOptions.allCases.randomElement()!) update(eye: .left, eyeOption: EyeOptions.allCases.randomElement()!)
update(eye: .right, eyeOption: EyeOptions.allCases.randomElement()!) update(eye: .right, eyeOption: EyeOptions.allCases.randomElement()!)
@@ -214,8 +206,8 @@ struct CreateIconView: View {
Button(action: { Button(action: {
let bigIconView = IconView(customIcon: customIcon, isPreview: false) let bigIconView = IconView(customIcon: customIcon, isPreview: false)
.frame(width: 1024, height: 1024, alignment: .center) .frame(width: 512, height: 512, alignment: .center)
.aspectRatio(contentMode: .fit) .aspectRatio(contentMode: .fill)
let icon = bigIconView.snapshot() let icon = bigIconView.snapshot()
if let data = icon.pngData() { if let data = icon.pngData() {
savedCustomIcon = data savedCustomIcon = data

19
Shared/views/IconView.swift
View File

@@ -27,6 +27,13 @@ struct IconView: View {
return CGFloat(-8) return CGFloat(-8)
} }
private var entireFuckingViewOffset: CGFloat {
if isPreview {
return CGFloat(0)
}
return CGFloat(25)
}
let columns = [ let columns = [
GridItem(.flexible(minimum: 1, maximum: 100), spacing: 1), GridItem(.flexible(minimum: 1, maximum: 100), spacing: 1),
GridItem(.flexible(minimum: 1, maximum: 100), spacing: 1), GridItem(.flexible(minimum: 1, maximum: 100), spacing: 1),
@@ -47,8 +54,7 @@ struct IconView: View {
.fill( .fill(
customIcon.bgColor customIcon.bgColor
) )
.frame(width: geo.size.width, height: geo.size.height, alignment: .center) .frame(maxWidth: .infinity, maxHeight: .infinity)
.position(x: geo.size.width/2, y: geo.size.height/2)
LazyVGrid(columns: columns, alignment: .leading, spacing: 0) { LazyVGrid(columns: columns, alignment: .leading, spacing: 0) {
ForEach(customIcon.background, id: \.self.1) { (image, uuid) in ForEach(customIcon.background, id: \.self.1) { (image, uuid) in
@@ -58,12 +64,7 @@ struct IconView: View {
.foregroundColor(customIcon.bgOverlayColor) .foregroundColor(customIcon.bgOverlayColor)
} }
} }
.frame(width: geo.size.width, .frame(maxWidth: .infinity, maxHeight: .infinity)
height: geo.size.height,
alignment: .center)
.position(x: geo.size.width/2 + gridXOffset,
y: geo.size.height/2 + gridYOffset)
.background( .background(
.clear .clear
) )
@@ -104,7 +105,7 @@ struct IconView: View {
y: geo.size.height*0.59) y: geo.size.height*0.59)
} }
.position(x: geo.size.width/2, .position(x: geo.size.width/2,
y: geo.size.height/2) y: geo.size.height/2 - entireFuckingViewOffset)
} }
} }
} }