diff --git a/gloss.xcodeproj/xcuserdata/saint.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/gloss.xcodeproj/xcuserdata/saint.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index a0cb3cf..4a9e215 100644 --- a/gloss.xcodeproj/xcuserdata/saint.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/gloss.xcodeproj/xcuserdata/saint.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -14,8 +14,8 @@ filePath = "gloss/ContentView.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "565" - endingLineNumber = "565" + startingLineNumber = "572" + endingLineNumber = "572" landmarkName = "body" landmarkType = "24"> @@ -30,8 +30,8 @@ filePath = "gloss/ContentView.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "567" - endingLineNumber = "567" + startingLineNumber = "574" + endingLineNumber = "574" landmarkName = "body" landmarkType = "24"> @@ -46,8 +46,8 @@ filePath = "gloss/ContentView.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "458" - endingLineNumber = "458" + startingLineNumber = "465" + endingLineNumber = "465" landmarkName = "body" landmarkType = "24"> @@ -62,8 +62,8 @@ filePath = "gloss/ContentView.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "426" - endingLineNumber = "426" + startingLineNumber = "433" + endingLineNumber = "433" landmarkName = "body" landmarkType = "24"> diff --git a/gloss/ContentView.swift b/gloss/ContentView.swift index 4ea3f03..3ca4567 100644 --- a/gloss/ContentView.swift +++ b/gloss/ContentView.swift @@ -10,6 +10,7 @@ import GRDB import GRDBQuery import Introspect import os +import SwiftUIReorderableForEach let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "network") @@ -310,6 +311,9 @@ struct ContentView: View { @State var refresh: Bool = false @State var refresh2: Bool = false + + @State var data = ["Imitation of Christ", "Psalms", "Fundamentals of Dogmatic Theology"] + @State var reorder = true @Query(RibbonRequest()) private var ribbons: [Ribbon] @@ -335,16 +339,21 @@ struct ContentView: View { var height = CGFloat(50) var xOffset = CGFloat(25) + var width = CGFloat(100 * 1.66 * scale) + + GeometryReader { geometry in ZStack (alignment: .top) { VStack (alignment: .leading) { VStack { - Text("Imitation of Christ") + + ReorderableForEach($data, allowReordering: $reorder) { item, isDragged in + Text(item) .foregroundColor(Color(UIColor(red: 0.76, green: 0.76, blue: 0.76, alpha: 1.00))) // // .background(Color(red: 0.3, green: 0.3, blue: 0.3)) // .foregroundColor(.white)) // .foregroundColor(.black) - .frame(minWidth: CGFloat(75), maxWidth: CGFloat(150), minHeight: height, maxHeight: height, alignment: .center) + .frame(minWidth: CGFloat(75), maxWidth: width + 30, minHeight: height, maxHeight: height, alignment: .center) // .background(.red) // .background(.yellow) .multilineTextAlignment(.center) @@ -352,7 +361,7 @@ struct ContentView: View { .padding([.top, .bottom], 10) .font(Font.custom("AveriaSerifLibre-Regular", size: CGFloat(10))) - .overlay( MyIcon().frame(width: CGFloat(100 * 1.66 * scale), height: CGFloat(100 * scale), alignment: .center) .foregroundColor(Color(UIColor(red: 0.30, green: 0.30, blue: 0.30, alpha: 0.4)))) + .overlay( MyIcon().frame(width: width, height: CGFloat(100 * scale), alignment: .center) .foregroundColor(Color(UIColor(red: 0.30, green: 0.30, blue: 0.30, alpha: 0.4)))) .offset(x: xOffset) .onTapGesture { @@ -360,46 +369,55 @@ struct ContentView: View { // selectedLine = seg.id // Print(selectedLine) } - .onDrag { - // self.draggedColor = color - return NSItemProvider() + + // .overlay(isDragged ? Color.white.opacity(0.6) : Color.clear) } + // Text("Imitation of Christ") - // .offset(y: 25) - Text("Psalms") - .foregroundColor(Color(UIColor(red: 0.76, green: 0.76, blue: 0.76, alpha: 1.00))) - // .background(Color(red: 0.3, green: 0.3, blue: 0.3)) - // .foregroundColor(.white)) - // .foregroundColor(.black) - .overlay( MyIcon().frame(width: CGFloat(100 * 1.66 * scale), height: CGFloat(100 * scale)) .foregroundColor(Color(UIColor(red: 0.56, green: 0.30, blue: 0.30, alpha: 0.4)))) - .frame(minWidth: CGFloat(75), maxWidth: CGFloat(75), minHeight: height, maxHeight: height, alignment: .center) - // .background(.red) - .multilineTextAlignment(.center) - .offset(x: xOffset) - .padding([.top, .bottom], 10) - // .minimumScaleFactor(0.5) - .font(Font.custom("AveriaSerifLibre-Regular", size: CGFloat(14))) - // Text("padding") + // Text("Imitation of Christ") + // .foregroundColor(Color(UIColor(red: 0.76, green: 0.76, blue: 0.76, alpha: 1.00))) + // // // .background(Color(red: 0.3, green: 0.3, blue: 0.3)) + // // .foregroundColor(.white)) + // // .foregroundColor(.black) + // .frame(minWidth: CGFloat(75), maxWidth: CGFloat(150), minHeight: height, maxHeight: height, alignment: .center) + // // .background(.red) + // // .background(.yellow) + // .multilineTextAlignment(.center) + // // .minimumScaleFactor(0.5) + // .padding([.top, .bottom], 10) + // .font(Font.custom("AveriaSerifLibre-Regular", size: CGFloat(10))) - Text("Fundamentals of Dogmatic Theology") - .foregroundColor(Color(UIColor(red: 0.76, green: 0.76, blue: 0.76, alpha: 1.00))) - // .background(Color(red: 0.3, green: 0.3, blue: 0.3)) - // .foregroundColor(.black) - .overlay( MyIcon().frame(width: CGFloat(100 * 1.66 * scale), height: CGFloat(100 * scale)) .foregroundColor(Color(UIColor(red: 0.30, green: 0.30, blue: 0.30, alpha: 0.4)))) - .frame(minWidth: CGFloat(75), maxWidth: CGFloat(75), minHeight: height, maxHeight: height, alignment: .center) - // .background(.red) - .multilineTextAlignment(.center) - .padding([.top, .bottom], 10) - .offset(x: xOffset) - // .minimumScaleFactor(0.5) - .font(Font.custom("AveriaSerifLibre-Regular", size: CGFloat(10))) - // .minimumScaleFactor(0.9) + // .overlay( MyIcon().frame(width: CGFloat(100 * 1.66 * scale), height: CGFloat(100 * scale), alignment: .center) .foregroundColor(Color(UIColor(red: 0.30, green: 0.30, blue: 0.30, alpha: 0.4)))) - // Text("padding") + // .offset(x: xOffset) + // .onTapGesture { + // Print("TAP") + // // selectedLine = seg.id + // // Print(selectedLine) + // } + // .onDrag { + // // self.draggedColor = color + // return NSItemProvider() + // } + +// Text("Psalms") +// .foregroundColor(Color(UIColor(red: 0.76, green: 0.76, blue: 0.76, alpha: 1.00))) +// // .background(Color(red: 0.3, green: 0.3, blue: 0.3)) +// // .foregroundColor(.white)) +// // .foregroundColor(.black) +// .overlay( MyIcon().frame(width: CGFloat(100 * 1.66 * scale), height: CGFloat(100 * scale)) .foregroundColor(Color(UIColor(red: 0.56, green: 0.30, blue: 0.30, alpha: 0.4)))) +// .frame(minWidth: CGFloat(75), maxWidth: CGFloat(75), minHeight: height, maxHeight: height, alignment: .center) +// // .background(.red) +// .multilineTextAlignment(.center) + +// .offset(x: xOffset) +// .padding([.top, .bottom], 10) +// // .minimumScaleFactor(0.5) +// .font(Font.custom("AveriaSerifLibre-Regular", size: CGFloat(14))) } .frame(width: geometry.size.width, height: geometry.size.height - 100, alignment: .topLeading) @@ -424,7 +442,7 @@ struct ContentView: View { } .background(Color(red: 0.1, green: 0.1, blue: 0.1)) .frame(alignment: .topLeading) - .animation(nil) + //.animation(nil) VStack {