Skip to content

Commit

Permalink
Commented out the preview code
Browse files Browse the repository at this point in the history
  • Loading branch information
@kieranb662
kieranb662 committed Nov 15, 2020
1 parent 92f6f95 commit cd39836
Showing 1 changed file with 117 additions and 117 deletions.
234 changes: 117 additions & 117 deletions Sources/Shapes/OmniRectangle/OmniRectangle.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,120 +87,120 @@ extension OmniRectangle: InsettableShape {
return shape
}
}

extension OmniRectangle {
fileprivate func prepare(stroke: StrokeStyle, width: CGFloat = 100, height: CGFloat = 100) -> some View {
ZStack {
self
.strokeBorder(Color.red, style: stroke)
}
.padding()
.frame(width: width, height: height)
// .border(Color.red)
}
}

// MARK: - This preview is meant to be used on an iPad Pro 12.9in simulator

struct OmniRectangle_Previews: PreviewProvider {
static let roundThinStrokeStyle = StrokeStyle(lineWidth: 1, lineJoin: .round)
static let roundThickStrokeStyle = StrokeStyle(lineWidth: 30, lineJoin: .round)
static let miterThinStrokeStyle = StrokeStyle(lineWidth: 1, lineJoin: .miter)
static let miterThickStrokeStyle = StrokeStyle(lineWidth: 30, lineJoin: .miter)
static let bevelThinStrokeStyle = StrokeStyle(lineWidth: 1, lineJoin: .bevel)
static let bevelThickStrokeStyle = StrokeStyle(lineWidth: 30, lineJoin: .bevel)

static let cornerMedley = OmniRectangle.CornerStyles(
topLeft: .round(radius: 0),
topRight: .round(radius: 10),
bottomLeft: .cut(depth: 15),
bottomRight: .cut(depth: 0)
)

static let maxCutDepth = OmniRectangle.CornerStyles(style: .cut(depth: 100))
static let maxCornerRadius = OmniRectangle.CornerStyles(style: .round(radius: 100))

static let squareCornersFlatEdges = OmniRectangle()
static let roundCornersFlatEdges = OmniRectangle(corners: OmniRectangle.CornerStyles(style: .round(radius: 10)))
static let maxRoundCornersFlatEdges = OmniRectangle(corners: maxCornerRadius)
static let cutCornersFlatEdges = OmniRectangle(corners: OmniRectangle.CornerStyles(style: .cut(depth: 10)))
static let maxCutCornersFlatEdges = OmniRectangle(corners: maxCutDepth)
static let cornerMedleyFlatEdges = OmniRectangle(corners: cornerMedley)

static let fullPositiveCurvature = OmniRectangle.EdgeStyles(curvature: 1)
static let halfPositiveCurvature = OmniRectangle.EdgeStyles(curvature: 0.5)
static let fullNegativeCurvature = OmniRectangle.EdgeStyles(curvature: -1)
static let halfNegativeCurvature = OmniRectangle.EdgeStyles(curvature: -0.5)

static func makeRow(_ omniShape: OmniRectangle) -> some View {
HStack(spacing: 30) {
Text(omniShape.cornerStyles.description)
.frame(width: 100, height: 100, alignment: .leading)

omniShape
.fill(Color.purple)
.padding()
.frame(width: 100, height: 100)
omniShape.prepare(stroke: roundThinStrokeStyle)
omniShape.prepare(stroke: roundThickStrokeStyle)
omniShape.prepare(stroke: miterThinStrokeStyle)
omniShape.prepare(stroke: miterThickStrokeStyle)
omniShape.prepare(stroke: bevelThinStrokeStyle)
omniShape.prepare(stroke: bevelThickStrokeStyle)
}
}

static func makeCurvatureGroup(corners: OmniRectangle.CornerStyles) -> some View {
Group {
makeRow(OmniRectangle(corners: corners, edges: fullPositiveCurvature))
makeRow(OmniRectangle(corners: corners, edges: halfPositiveCurvature))
makeRow(OmniRectangle(corners: corners, edges: .allFlat()))
makeRow(OmniRectangle(corners: corners, edges: halfNegativeCurvature))
makeRow(OmniRectangle(corners: corners, edges: fullNegativeCurvature))
}
}

static func makeLabel(lineWidth: CGFloat, lineJoin: String) -> some View {
Text("Stroked\nwidth: \(String(format: "%.0f", Double(lineWidth)))\njoin: \(lineJoin)")
.frame(width: 100, height: 100)
}

static func header() -> some View {
HStack(alignment: .firstTextBaseline, spacing: 30) {
// Text("Top left:\nTop right:\nBottom left:\nBottom right:\n")
Text("Filled")
.frame(width: 100, height: 100)
makeLabel(lineWidth: 1, lineJoin: "round")
makeLabel(lineWidth: 30, lineJoin: "round")
makeLabel(lineWidth: 1, lineJoin: "miter")
makeLabel(lineWidth: 30, lineJoin: "miter")
makeLabel(lineWidth: 1, lineJoin: "bevel")
makeLabel(lineWidth: 30, lineJoin: "bevel")
}
}

static var previews: some View {
ScrollView {
LazyVStack(spacing: 40, pinnedViews: [.sectionHeaders]) {
Section(header: ZStack {
Color(white: 0.05)
.edgesIgnoringSafeArea(.top)
.frame(height: 120)
header()
}) {
Group {
makeRow(squareCornersFlatEdges)
makeRow(roundCornersFlatEdges)
makeRow(maxRoundCornersFlatEdges)
makeRow(cutCornersFlatEdges)
makeRow(maxCutCornersFlatEdges)
makeRow(cornerMedleyFlatEdges)
}
makeCurvatureGroup(corners: .allSquare())
makeCurvatureGroup(corners: cornerMedley)

}
}
}.preferredColorScheme(.dark).edgesIgnoringSafeArea(.top)
}
}
//
//extension OmniRectangle {
// fileprivate func prepare(stroke: StrokeStyle, width: CGFloat = 100, height: CGFloat = 100) -> some View {
// ZStack {
// self
// .strokeBorder(Color.red, style: stroke)
// }
// .padding()
// .frame(width: width, height: height)
// // .border(Color.red)
// }
//}
//
//// MARK: - This preview is meant to be used on an iPad Pro 12.9in simulator
//
//struct OmniRectangle_Previews: PreviewProvider {
// static let roundThinStrokeStyle = StrokeStyle(lineWidth: 1, lineJoin: .round)
// static let roundThickStrokeStyle = StrokeStyle(lineWidth: 30, lineJoin: .round)
// static let miterThinStrokeStyle = StrokeStyle(lineWidth: 1, lineJoin: .miter)
// static let miterThickStrokeStyle = StrokeStyle(lineWidth: 30, lineJoin: .miter)
// static let bevelThinStrokeStyle = StrokeStyle(lineWidth: 1, lineJoin: .bevel)
// static let bevelThickStrokeStyle = StrokeStyle(lineWidth: 30, lineJoin: .bevel)
//
// static let cornerMedley = OmniRectangle.CornerStyles(
// topLeft: .round(radius: 0),
// topRight: .round(radius: 10),
// bottomLeft: .cut(depth: 15),
// bottomRight: .cut(depth: 0)
// )
//
// static let maxCutDepth = OmniRectangle.CornerStyles(style: .cut(depth: 100))
// static let maxCornerRadius = OmniRectangle.CornerStyles(style: .round(radius: 100))
//
// static let squareCornersFlatEdges = OmniRectangle()
// static let roundCornersFlatEdges = OmniRectangle(corners: OmniRectangle.CornerStyles(style: .round(radius: 10)))
// static let maxRoundCornersFlatEdges = OmniRectangle(corners: maxCornerRadius)
// static let cutCornersFlatEdges = OmniRectangle(corners: OmniRectangle.CornerStyles(style: .cut(depth: 10)))
// static let maxCutCornersFlatEdges = OmniRectangle(corners: maxCutDepth)
// static let cornerMedleyFlatEdges = OmniRectangle(corners: cornerMedley)
//
// static let fullPositiveCurvature = OmniRectangle.EdgeStyles(curvature: 1)
// static let halfPositiveCurvature = OmniRectangle.EdgeStyles(curvature: 0.5)
// static let fullNegativeCurvature = OmniRectangle.EdgeStyles(curvature: -1)
// static let halfNegativeCurvature = OmniRectangle.EdgeStyles(curvature: -0.5)
//
// static func makeRow(_ omniShape: OmniRectangle) -> some View {
// HStack(spacing: 30) {
// Text(omniShape.cornerStyles.description)
// .frame(width: 100, height: 100, alignment: .leading)
//
// omniShape
// .fill(Color.purple)
// .padding()
// .frame(width: 100, height: 100)
// omniShape.prepare(stroke: roundThinStrokeStyle)
// omniShape.prepare(stroke: roundThickStrokeStyle)
// omniShape.prepare(stroke: miterThinStrokeStyle)
// omniShape.prepare(stroke: miterThickStrokeStyle)
// omniShape.prepare(stroke: bevelThinStrokeStyle)
// omniShape.prepare(stroke: bevelThickStrokeStyle)
// }
// }
//
// static func makeCurvatureGroup(corners: OmniRectangle.CornerStyles) -> some View {
// Group {
// makeRow(OmniRectangle(corners: corners, edges: fullPositiveCurvature))
// makeRow(OmniRectangle(corners: corners, edges: halfPositiveCurvature))
// makeRow(OmniRectangle(corners: corners, edges: .allFlat()))
// makeRow(OmniRectangle(corners: corners, edges: halfNegativeCurvature))
// makeRow(OmniRectangle(corners: corners, edges: fullNegativeCurvature))
// }
// }
//
// static func makeLabel(lineWidth: CGFloat, lineJoin: String) -> some View {
// Text("Stroked\nwidth: \(String(format: "%.0f", Double(lineWidth)))\njoin: \(lineJoin)")
// .frame(width: 100, height: 100)
// }
//
// static func header() -> some View {
// HStack(alignment: .firstTextBaseline, spacing: 30) {
// // Text("Top left:\nTop right:\nBottom left:\nBottom right:\n")
// Text("Filled")
// .frame(width: 100, height: 100)
// makeLabel(lineWidth: 1, lineJoin: "round")
// makeLabel(lineWidth: 30, lineJoin: "round")
// makeLabel(lineWidth: 1, lineJoin: "miter")
// makeLabel(lineWidth: 30, lineJoin: "miter")
// makeLabel(lineWidth: 1, lineJoin: "bevel")
// makeLabel(lineWidth: 30, lineJoin: "bevel")
// }
// }
//
// static var previews: some View {
// ScrollView {
// LazyVStack(spacing: 40, pinnedViews: [.sectionHeaders]) {
// Section(header: ZStack {
// Color(white: 0.05)
// .edgesIgnoringSafeArea(.top)
// .frame(height: 120)
// header()
// }) {
// Group {
// makeRow(squareCornersFlatEdges)
// makeRow(roundCornersFlatEdges)
// makeRow(maxRoundCornersFlatEdges)
// makeRow(cutCornersFlatEdges)
// makeRow(maxCutCornersFlatEdges)
// makeRow(cornerMedleyFlatEdges)
// }
// makeCurvatureGroup(corners: .allSquare())
// makeCurvatureGroup(corners: cornerMedley)
//
// }
// }
// }.preferredColorScheme(.dark).edgesIgnoringSafeArea(.top)
// }
//}

0 comments on commit cd39836

Please sign in to comment.