fix out of order cards

This commit is contained in:
breadone
2024-06-22 20:04:26 +12:00
parent 9363d41bbb
commit 79c6422630
1483 changed files with 9118 additions and 1192 deletions

View File

@@ -3,7 +3,7 @@
"-sdk"
"/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator17.5.sdk"
"-target"
"arm64-apple-ios17.5-simulator"
"arm64-apple-ios17.0-simulator"
"-enable-bare-slash-regex"
"-module-cache-path"
"/Users/pradyun/Library/Developer/Xcode/DerivedData/ModuleCache.noindex"

View File

@@ -14,7 +14,7 @@ extension CardView {
VStack(alignment: .trailing) {
Text(card.content)
}
.frame(minHeight: __designTimeInteger("#885.[2].[2].property.[0].[0].modifier[0].arg[0].value", fallback: 80))
.frame(minHeight: __designTimeInteger("#6455.[2].[2].property.[0].[0].modifier[0].arg[0].value", fallback: 80))
// .padding()
// .background(Color(hex: proj.color) ?? .blue)
// .clipShape(.rect(cornerRadius: 12))
@@ -40,7 +40,7 @@ extension CardsView {
extension CardsView {
@_dynamicReplacement(for: addNewCard(txt:)) private func __preview__addNewCard(txt: String) {
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/View/CardsView.swift", line: 54)
let card = OCCard(content: txt, index: (project.cards.last?.index ?? __designTimeInteger("#885.[1].[6].[0].value.arg[1].value.[0]", fallback: -1)) + __designTimeInteger("#885.[1].[6].[0].value.arg[1].value.[1]", fallback: 1)) // adds one to the index, unless there arent any cards in which case default to 0
let card = OCCard(content: txt, index: (project.cards.last?.index ?? __designTimeInteger("#6455.[1].[6].[0].value.arg[1].value.[0]", fallback: -1)) + __designTimeInteger("#6455.[1].[6].[0].value.arg[1].value.[1]", fallback: 1)) // adds one to the index, unless there arent any cards in which case default to 0
project.cards.append(card)
try! ctx.save()
@@ -52,7 +52,7 @@ extension CardsView {
@_dynamicReplacement(for: body) private var __preview__body: some View {
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/View/CardsView.swift", line: 19)
List {
ForEach(project.cards) { card in
ForEach(project.sortedCards) { card in
CardView(proj: project, card: card)
}
.onDelete(perform: deleteItems)
@@ -63,19 +63,19 @@ extension CardsView {
.toolbar {
ToolbarItem(placement: .topBarTrailing) {
Button(action: { addNewCard.toggle() }) {
Label(__designTimeString("#885.[1].[5].property.[0].[0].modifier[3].arg[0].value.[0].arg[1].value.[0].arg[1].value.[0].arg[0].value", fallback: "Add Item"), systemImage: __designTimeString("#885.[1].[5].property.[0].[0].modifier[3].arg[0].value.[0].arg[1].value.[0].arg[1].value.[0].arg[1].value", fallback: "plus"))
Label(__designTimeString("#6455.[1].[5].property.[0].[0].modifier[3].arg[0].value.[0].arg[1].value.[0].arg[1].value.[0].arg[0].value", fallback: "Add Item"), systemImage: __designTimeString("#6455.[1].[5].property.[0].[0].modifier[3].arg[0].value.[0].arg[1].value.[0].arg[1].value.[0].arg[1].value", fallback: "plus"))
}
}
ToolbarItem(placement: .topBarTrailing) {
Menu {
NavigationLink(destination: {ProjectSlideshowView(project: project)}) {
Label(title: { Text(__designTimeString("#885.[1].[5].property.[0].[0].modifier[3].arg[0].value.[1].arg[1].value.[0].arg[0].value.[0].arg[1].value.[0].arg[0].value.[0].arg[0].value", fallback: "Slideshow"))}, icon: {Image(systemName: __designTimeString("#885.[1].[5].property.[0].[0].modifier[3].arg[0].value.[1].arg[1].value.[0].arg[0].value.[0].arg[1].value.[0].arg[1].value.[0].arg[0].value", fallback: "tv.fill")) })
Label(title: { Text(__designTimeString("#6455.[1].[5].property.[0].[0].modifier[3].arg[0].value.[1].arg[1].value.[0].arg[0].value.[0].arg[1].value.[0].arg[0].value.[0].arg[0].value", fallback: "Cue Cards"))}, icon: {Image(systemName: __designTimeString("#6455.[1].[5].property.[0].[0].modifier[3].arg[0].value.[1].arg[1].value.[0].arg[0].value.[0].arg[1].value.[0].arg[1].value.[0].arg[0].value", fallback: "rectangle.stack.fill")) })
}
NavigationLink(destination: {TeleprompterView(project: project)}) {
Label(title: { Text(__designTimeString("#885.[1].[5].property.[0].[0].modifier[3].arg[0].value.[1].arg[1].value.[0].arg[0].value.[1].arg[1].value.[0].arg[0].value.[0].arg[0].value", fallback: "Teleprompter"))}, icon: {Image(systemName: __designTimeString("#885.[1].[5].property.[0].[0].modifier[3].arg[0].value.[1].arg[1].value.[0].arg[0].value.[1].arg[1].value.[0].arg[1].value.[0].arg[0].value", fallback: "note.text")) })
Label(title: { Text(__designTimeString("#6455.[1].[5].property.[0].[0].modifier[3].arg[0].value.[1].arg[1].value.[0].arg[0].value.[1].arg[1].value.[0].arg[0].value.[0].arg[0].value", fallback: "Teleprompter"))}, icon: {Image(systemName: __designTimeString("#6455.[1].[5].property.[0].[0].modifier[3].arg[0].value.[1].arg[1].value.[0].arg[0].value.[1].arg[1].value.[0].arg[1].value.[0].arg[0].value", fallback: "note.text")) })
}
} label: {
Image(systemName: __designTimeString("#885.[1].[5].property.[0].[0].modifier[3].arg[0].value.[1].arg[1].value.[0].arg[1].value.[0].arg[0].value", fallback: "play.fill"))
Image(systemName: __designTimeString("#6455.[1].[5].property.[0].[0].modifier[3].arg[0].value.[1].arg[1].value.[0].arg[1].value.[0].arg[0].value", fallback: "play.fill"))
}
}

View File

@@ -3,7 +3,7 @@
"-sdk"
"/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator17.5.sdk"
"-target"
"arm64-apple-ios17.5-simulator"
"arm64-apple-ios17.0-simulator"
"-enable-bare-slash-regex"
"-module-cache-path"
"/Users/pradyun/Library/Developer/Xcode/DerivedData/ModuleCache.noindex"

View File

@@ -11,7 +11,7 @@ import SwiftUI
extension MainView {
@_dynamicReplacement(for: deleteItems(offsets:)) private func __preview__deleteItems(offsets: IndexSet) {
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/View/MainView.swift", line: 66)
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/View/MainView.swift", line: 62)
withAnimation {
for index in offsets {
modelContext.delete(items[index])
@@ -24,7 +24,7 @@ extension MainView {
extension MainView {
@_dynamicReplacement(for: addItem(name:color:)) private func __preview__addItem(name: String, color: String) {
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/View/MainView.swift", line: 59)
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/View/MainView.swift", line: 55)
withAnimation {
let newProject = OCProject(name: name, color: color)
modelContext.insert(newProject)
@@ -48,28 +48,24 @@ extension MainView {
.bold()
.font(.title2)
.foregroundStyle(Color(hex: project.color) ?? .white)
Text("\(project.cards.count) Cards")
Text("\(project.cards.count) \(project.cards.count == __designTimeInteger("#6530.[2].[4].property.[0].[0].arg[0].value.[0].arg[0].value.[0].arg[1].value.[0].arg[1].value.[0].arg[1].value.[1].arg[0].value.[3].value.arg[0].value.if.[0]", fallback: 1) ? __designTimeString("#6530.[2].[4].property.[0].[0].arg[0].value.[0].arg[0].value.[0].arg[1].value.[0].arg[1].value.[0].arg[1].value.[1].arg[0].value.[3].value.arg[0].value.then", fallback: "Card") : __designTimeString("#6530.[2].[4].property.[0].[0].arg[0].value.[0].arg[0].value.[0].arg[1].value.[0].arg[1].value.[0].arg[1].value.[1].arg[0].value.[3].value.arg[0].value.else", fallback: "Cards"))")
}
}
.padding(.horizontal, __designTimeInteger("#723.[2].[4].property.[0].[0].arg[0].value.[0].arg[0].value.[0].arg[1].value.[0].modifier[0].arg[1].value", fallback: 8))
.padding(.vertical, __designTimeInteger("#723.[2].[4].property.[0].[0].arg[0].value.[0].arg[0].value.[0].arg[1].value.[0].modifier[1].arg[1].value", fallback: 3))
.padding(.vertical, __designTimeInteger("#6530.[2].[4].property.[0].[0].arg[0].value.[0].arg[0].value.[0].arg[1].value.[0].modifier[0].arg[1].value", fallback: 3))
}
.onDelete(perform: deleteItems)
}
.toolbar {
// ToolbarItem(placement: .navigationBarTrailing) {
// EditButton()
// }
ToolbarItem {
Button(action: { addNewProject.toggle() }) {
Label(__designTimeString("#723.[2].[4].property.[0].[0].arg[0].value.[0].modifier[0].arg[0].value.[0].arg[0].value.[0].arg[1].value.[0].arg[0].value", fallback: "Add Item"), systemImage: __designTimeString("#723.[2].[4].property.[0].[0].arg[0].value.[0].modifier[0].arg[0].value.[0].arg[0].value.[0].arg[1].value.[0].arg[1].value", fallback: "plus"))
Label(__designTimeString("#6530.[2].[4].property.[0].[0].arg[0].value.[0].modifier[0].arg[0].value.[0].arg[0].value.[0].arg[1].value.[0].arg[0].value", fallback: "Add Item"), systemImage: __designTimeString("#6530.[2].[4].property.[0].[0].arg[0].value.[0].modifier[0].arg[0].value.[0].arg[0].value.[0].arg[1].value.[0].arg[1].value", fallback: "plus"))
}
}
}
.navigationTitle(__designTimeString("#723.[2].[4].property.[0].[0].arg[0].value.[0].modifier[1].arg[0].value", fallback: "Projects"))
.navigationTitle(__designTimeString("#6530.[2].[4].property.[0].[0].arg[0].value.[0].modifier[1].arg[0].value", fallback: "Projects"))
} detail: {
Text(__designTimeString("#723.[2].[4].property.[0].[0].arg[1].value.[0].arg[0].value", fallback: "Select an item"))
Text(__designTimeString("#6530.[2].[4].property.[0].[0].arg[1].value.[0].arg[0].value", fallback: "Select an item"))
}
.sheet(isPresented: $addNewProject) {
NewProjectForm(completionHandler: addItem)

View File

@@ -12,9 +12,9 @@ extension ColorChooserCircle {
@_dynamicReplacement(for: body) private var __preview__body: some View {
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/View/NewProjectForm.swift", line: 59)
Circle()
.strokeBorder(Color.gray,lineWidth: __designTimeInteger("#22127.[2].[1].property.[0].[0].modifier[0].arg[1].value", fallback: 2))
.strokeBorder(Color.gray,lineWidth: __designTimeInteger("#8129.[2].[1].property.[0].[0].modifier[0].arg[1].value", fallback: 2))
.background(Circle().foregroundColor(color))
.frame(minHeight: __designTimeInteger("#22127.[2].[1].property.[0].[0].modifier[2].arg[0].value", fallback: 25))
.frame(minHeight: __designTimeInteger("#8129.[2].[1].property.[0].[0].modifier[2].arg[0].value", fallback: 25))
#sourceLocation()
}
@@ -25,8 +25,8 @@ extension NewProjectForm {
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/View/NewProjectForm.swift", line: 21)
NavigationView {
Form {
TextField(__designTimeString("#22127.[1].[5].property.[0].[0].arg[0].value.[0].arg[0].value.[0].arg[0].value", fallback: "Project Name"), text: $newProjectName)
Section(header: Text(__designTimeString("#22127.[1].[5].property.[0].[0].arg[0].value.[0].arg[0].value.[1].arg[0].value.arg[0].value", fallback: "Project Colour"))) {
TextField(__designTimeString("#8129.[1].[5].property.[0].[0].arg[0].value.[0].arg[0].value.[0].arg[0].value", fallback: "Project Name"), text: $newProjectName)
Section(header: Text(__designTimeString("#8129.[1].[5].property.[0].[0].arg[0].value.[0].arg[0].value.[1].arg[0].value.arg[0].value", fallback: "Project Colour"))) {
HStack {
ForEach(colors, id: \.self) { clr in
ColorChooserCircle(color: clr)
@@ -39,16 +39,16 @@ extension NewProjectForm {
}
}
}
.navigationTitle(__designTimeString("#22127.[1].[5].property.[0].[0].arg[0].value.[0].modifier[0].arg[0].value", fallback: "Add New Project")).foregroundStyle(chosenColor)
.navigationTitle(__designTimeString("#8129.[1].[5].property.[0].[0].arg[0].value.[0].modifier[0].arg[0].value", fallback: "Add New Project")).foregroundStyle(chosenColor)
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .topBarLeading) {
Button(__designTimeString("#22127.[1].[5].property.[0].[0].arg[0].value.[0].modifier[3].arg[0].value.[0].arg[1].value.[0].arg[0].value", fallback: "Cancel"), role: .cancel) { dismiss() }
Button(__designTimeString("#8129.[1].[5].property.[0].[0].arg[0].value.[0].modifier[3].arg[0].value.[0].arg[1].value.[0].arg[0].value", fallback: "Cancel"), role: .cancel) { dismiss() }
.foregroundStyle(.red)
}
ToolbarItem(placement: .topBarTrailing) {
Button(__designTimeString("#22127.[1].[5].property.[0].[0].arg[0].value.[0].modifier[3].arg[0].value.[1].arg[1].value.[0].arg[0].value", fallback: "Done")) {
completionHandler(newProjectName, chosenColor.toHex() ?? __designTimeString("#22127.[1].[5].property.[0].[0].arg[0].value.[0].modifier[3].arg[0].value.[1].arg[1].value.[0].arg[1].value.[0].arg[1].value.[0]", fallback: "FF0000"))
Button(__designTimeString("#8129.[1].[5].property.[0].[0].arg[0].value.[0].modifier[3].arg[0].value.[1].arg[1].value.[0].arg[0].value", fallback: "Done")) {
completionHandler(newProjectName, chosenColor.toHex() ?? __designTimeString("#8129.[1].[5].property.[0].[0].arg[0].value.[0].modifier[3].arg[0].value.[1].arg[1].value.[0].arg[1].value.[0].arg[1].value.[0]", fallback: "FF0000"))
dismiss()
}
}

View File

@@ -3,7 +3,7 @@
"-sdk"
"/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator17.5.sdk"
"-target"
"arm64-apple-ios17.5-simulator"
"arm64-apple-ios17.0-simulator"
"-enable-bare-slash-regex"
"-module-cache-path"
"/Users/pradyun/Library/Developer/Xcode/DerivedData/ModuleCache.noindex"

View File

@@ -11,7 +11,7 @@ import SwiftData
extension OCProject {
@_dynamicReplacement(for: addCards(cards:)) private func __preview__addCards(cards: OCCard...) {
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/Model/OCProject.swift", line: 32)
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/Model/OCProject.swift", line: 42)
cards.forEach({ self.cards.append($0) })
#sourceLocation()
@@ -20,12 +20,32 @@ extension OCProject {
extension OCProject {
@_dynamicReplacement(for: updateEditedDate(newDate:)) private func __preview__updateEditedDate(newDate: Date = Date()) {
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/Model/OCProject.swift", line: 28)
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/Model/OCProject.swift", line: 38)
self.lastEditedDate = newDate
#sourceLocation()
}
}
extension OCProject {
@_dynamicReplacement(for: sortedCards) private var __preview__sortedCards: [OCCard] {
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/Model/OCProject.swift", line: 26)
return self.cards.sorted(by: { $0.index < $1.index })
#sourceLocation()
}
}
extension OCProject {
@_dynamicReplacement(for: script) private var __preview__script: String {
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/Model/OCProject.swift", line: 20)
var txt = __designTimeString("#7544.[2].[5].property.[0].[0].value", fallback: "")
cards.forEach { txt.append("\($0.content)\n---\n") }
return txt
#sourceLocation()
}
}
import class OnCue.OCProject

View File

@@ -3,7 +3,7 @@
"-sdk"
"/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator17.5.sdk"
"-target"
"arm64-apple-ios17.5-simulator"
"arm64-apple-ios17.0-simulator"
"-enable-bare-slash-regex"
"-module-cache-path"
"/Users/pradyun/Library/Developer/Xcode/DerivedData/ModuleCache.noindex"

View File

@@ -1,5 +1,12 @@
{
"source": "/Users/pradyun/Code/Apps/OnCue/Build/Intermediates.noindex/Previews/iphonesimulator/OnCue/Intermediates.noindex/OnCue.build/Debug-iphonesimulator/OnCue.build/Objects-normal/arm64/ProjectSlideshowView.1.preview-thunk.swift",
"tables": {},
"tables": {
"Localizable": [
{
"comment": "",
"key": "%lld"
}
]
},
"version": 1
}

View File

@@ -10,13 +10,13 @@ import SwiftUI
extension CueCardView {
@_dynamicReplacement(for: body) private var __preview__body: some View {
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/View/ProjectSlideshowView.swift", line: 34)
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/View/ProjectSlideshowView.swift", line: 36)
VStack(alignment: .leading) {
Text(card.content)
.foregroundColor(.primary)
.font(.system(size: __designTimeInteger("#1083.[2].[1].property.[0].[0].arg[1].value.[0].modifier[1].arg[0].value.arg[0].value", fallback: 25)))
.font(.system(size: __designTimeInteger("#6525.[2].[1].property.[0].[0].arg[1].value.[0].modifier[1].arg[0].value.arg[0].value", fallback: 25)))
.padding()
.frame(height: __designTimeInteger("#1083.[2].[1].property.[0].[0].arg[1].value.[0].modifier[3].arg[0].value", fallback: 550))
.frame(height: __designTimeInteger("#6525.[2].[1].property.[0].[0].arg[1].value.[0].modifier[3].arg[0].value", fallback: 550))
Spacer()
}
@@ -28,15 +28,17 @@ extension ProjectSlideshowView {
@_dynamicReplacement(for: body) private var __preview__body: some View {
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/View/ProjectSlideshowView.swift", line: 14)
TabView() {
ForEach(project.cards) { card in
ForEach(project.sortedCards) { card in
CueCardView(card: card)
.navigationTitle("\(card.index)")
.navigationBarTitleDisplayMode(.inline)
}
}
.tabViewStyle(PageTabViewStyle(indexDisplayMode: .always))
.toolbar {
ToolbarItem(placement: .topBarTrailing) {
NavigationLink(destination: { CardsView(project: project) }) {
Image(systemName: __designTimeString("#1083.[1].[1].property.[0].[0].modifier[1].arg[0].value.[0].arg[1].value.[0].arg[1].value.[0].arg[0].value", fallback: "stop.fill"))
Image(systemName: __designTimeString("#6525.[1].[1].property.[0].[0].modifier[1].arg[0].value.[0].arg[1].value.[0].arg[1].value.[0].arg[0].value", fallback: "stop.fill"))
}
}
}

View File

@@ -1,5 +1,12 @@
{
"source": "/Users/pradyun/Code/Apps/OnCue/OnCue/View/ProjectSlideshowView.swift",
"tables": {},
"tables": {
"Localizable": [
{
"comment": "",
"key": "%lld"
}
]
},
"version": 1
}

View File

@@ -13,8 +13,8 @@ extension TeleprompterView {
#sourceLocation(file: "/Users/pradyun/Code/Apps/OnCue/OnCue/View/TeleprompterView.swift", line: 14)
ScrollView {
Text(project.script)
.font(.system(size: __designTimeInteger("#1193.[1].[1].property.[0].[0].arg[0].value.[0].modifier[0].arg[0].value.arg[0].value", fallback: 25)))
.padding()
.font(.system(size: __designTimeInteger("#1193.[1].[1].property.[0].[0].arg[0].value.[0].modifier[0].arg[0].value.arg[0].value", fallback: 45)))
.padding(.horizontal)
}
.toolbar {
ToolbarItem(placement: .topBarTrailing) {

View File

@@ -0,0 +1,5 @@
{
"source": "/Users/pradyun/Code/Apps/OnCue/Shared/ColorModel.swift",
"tables": {},
"version": 1
}

View File

@@ -0,0 +1,5 @@
{
"source": "/Users/pradyun/Code/Apps/OnCue/OnCuePresenter Watch App/View/CueCardViewPresenter.swift",
"tables": {},
"version": 1
}

View File

@@ -4,7 +4,23 @@
"Localizable": [
{
"comment": "",
"key": "Hello, world!"
"key": "Projects"
},
{
"comment": "",
"key": "%@"
},
{
"comment": "",
"key": "%lld %@"
},
{
"comment": "",
"key": "Add Item"
},
{
"comment": "",
"key": "Select an item"
}
]
},

Some files were not shown because too many files have changed in this diff Show More