saint
/
gloss-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

working for now

undo
Saint 2023-06-27 19:04:24 -04:00
parent d04f004361
commit 28e780e9b7
3 changed files with 182 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.compile
View File

@ -2,31 +2,31 @@
{ {
"module_name": "Introspect", "module_name": "Introspect",
"directory": "/Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/SwiftUI-Introspect -experimental-emit-module-separately", "directory": "/Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/SwiftUI-Introspect -experimental-emit-module-separately",
"command": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc -module-name Introspect -Onone -enforce-exclusivity\\=checked @/Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/Objects-normal/arm64/Introspect.SwiftFileList -DSWIFT_PACKAGE -DDEBUG -DXcode -sdk /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk -target arm64-apple-ios13.0 -g -Xfrontend -serialize-debugging-options -enable-testing -swift-version 5 -I /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -I /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/lib -F /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -F /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/Frameworks -F /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk/Developer/Library/Frameworks -c -j12 -enable-batch-mode -incremental -output-file-map /Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/Objects-normal/arm64/Introspect-OutputFileMap.json -use-frontend-parseable-output -save-temps -no-color-diagnostics -serialize-diagnostics -emit-dependencies -emit-module -emit-module-path /Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/Objects-normal/arm64/Introspect.swiftmodule -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/swift-overrides.hmap -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos/include -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/DerivedSources-normal/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/DerivedSources/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/DerivedSources -Xcc -DSWIFT_PACKAGE -Xcc -DDEBUG\\=1 -emit-objc-header -emit-objc-header-path /Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/Objects-normal/arm64/Introspect-Swift.h -working-directory /Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/SwiftUI-Introspect -experimental-emit-module-separately", "command": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc -module-name Introspect -Onone -enforce-exclusivity\\=checked @/Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/Objects-normal/arm64/Introspect.SwiftFileList -DSWIFT_PACKAGE -DDEBUG -DXcode -sdk /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk -target arm64-apple-ios13.0 -g -Xfrontend -serialize-debugging-options -enable-testing -swift-version 5 -I /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -I /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/lib -F /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -F /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/Frameworks -F /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk/Developer/Library/Frameworks -c -j12 -enable-batch-mode -incremental -output-file-map /Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/Objects-normal/arm64/Introspect-OutputFileMap.json -save-temps -no-color-diagnostics -serialize-diagnostics -emit-dependencies -emit-module -emit-module-path /Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/Objects-normal/arm64/Introspect.swiftmodule -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/swift-overrides.hmap -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos/include -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/DerivedSources-normal/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/DerivedSources/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/DerivedSources -Xcc -DSWIFT_PACKAGE -Xcc -DDEBUG\\=1 -emit-objc-header -emit-objc-header-path /Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/Objects-normal/arm64/Introspect-Swift.h -working-directory /Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/SwiftUI-Introspect -experimental-emit-module-separately",
"fileLists": [ "fileLists": [
"/Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/Objects-normal/arm64/Introspect.SwiftFileList" "/Users/saint/Library/Caches/Xbase/code_gloss/Introspect.build/Debug-iphoneos/Introspect.build/Objects-normal/arm64/Introspect.SwiftFileList"
] ]
}, },
{
"module_name": "GRDBQuery",
"directory": "/Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/GRDBQuery -experimental-emit-module-separately",
"command": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc -module-name GRDBQuery -Onone -enforce-exclusivity\\=checked @/Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/Objects-normal/arm64/GRDBQuery.SwiftFileList -DSWIFT_PACKAGE -DDEBUG -DXcode -sdk /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk -target arm64-apple-ios13.0 -g -Xfrontend -serialize-debugging-options -enable-testing -swift-version 5 -I /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -I /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/lib -F /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -F /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/Frameworks -F /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk/Developer/Library/Frameworks -c -j12 -enable-batch-mode -incremental -output-file-map /Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/Objects-normal/arm64/GRDBQuery-OutputFileMap.json -use-frontend-parseable-output -save-temps -no-color-diagnostics -serialize-diagnostics -emit-dependencies -emit-module -emit-module-path /Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/Objects-normal/arm64/GRDBQuery.swiftmodule -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/swift-overrides.hmap -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos/include -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/DerivedSources-normal/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/DerivedSources/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/DerivedSources -Xcc -DSWIFT_PACKAGE -Xcc -DDEBUG\\=1 -emit-objc-header -emit-objc-header-path /Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/Objects-normal/arm64/GRDBQuery-Swift.h -working-directory /Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/GRDBQuery -experimental-emit-module-separately",
"fileLists": [
"/Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/Objects-normal/arm64/GRDBQuery.SwiftFileList"
]
},
{ {
"module_name": "GRDB", "module_name": "GRDB",
"directory": "/Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/GRDB.swift -experimental-emit-module-separately", "directory": "/Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/GRDB.swift -experimental-emit-module-separately",
"command": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc -module-name GRDB -Onone -enforce-exclusivity\\=checked @/Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/Objects-normal/arm64/GRDB.SwiftFileList -DSWIFT_PACKAGE -DDEBUG -Xcc -fmodule-map-file\\=/Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/GRDB.swift/Sources/CSQLite/module.modulemap -DXcode -sdk /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk -target arm64-apple-ios11.0 -g -Xfrontend -serialize-debugging-options -enable-testing -swift-version 5 -I /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -I /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/lib -F /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -F /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/Frameworks -F /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk/Developer/Library/Frameworks -emit-localized-strings -emit-localized-strings-path /Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/Objects-normal/arm64 -c -j12 -enable-batch-mode -incremental -output-file-map /Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/Objects-normal/arm64/GRDB-OutputFileMap.json -use-frontend-parseable-output -save-temps -no-color-diagnostics -serialize-diagnostics -emit-dependencies -emit-module -emit-module-path /Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/Objects-normal/arm64/GRDB.swiftmodule -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/swift-overrides.hmap -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos/include -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/DerivedSources-normal/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/DerivedSources/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/DerivedSources -Xcc -DSWIFT_PACKAGE -Xcc -DDEBUG\\=1 -emit-objc-header -emit-objc-header-path /Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/Objects-normal/arm64/GRDB-Swift.h -working-directory /Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/GRDB.swift -experimental-emit-module-separately", "command": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc -module-name GRDB -Onone -enforce-exclusivity\\=checked @/Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/Objects-normal/arm64/GRDB.SwiftFileList -DSWIFT_PACKAGE -DDEBUG -Xcc -fmodule-map-file\\=/Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/GRDB.swift/Sources/CSQLite/module.modulemap -DXcode -sdk /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk -target arm64-apple-ios11.0 -g -Xfrontend -serialize-debugging-options -enable-testing -swift-version 5 -I /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -I /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/lib -F /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -F /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/Frameworks -F /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk/Developer/Library/Frameworks -emit-localized-strings -emit-localized-strings-path /Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/Objects-normal/arm64 -c -j12 -enable-batch-mode -incremental -output-file-map /Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/Objects-normal/arm64/GRDB-OutputFileMap.json -save-temps -no-color-diagnostics -serialize-diagnostics -emit-dependencies -emit-module -emit-module-path /Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/Objects-normal/arm64/GRDB.swiftmodule -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/swift-overrides.hmap -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos/include -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/DerivedSources-normal/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/DerivedSources/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/DerivedSources -Xcc -DSWIFT_PACKAGE -Xcc -DDEBUG\\=1 -emit-objc-header -emit-objc-header-path /Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/Objects-normal/arm64/GRDB-Swift.h -working-directory /Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/GRDB.swift -experimental-emit-module-separately",
"fileLists": [ "fileLists": [
"/Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/Objects-normal/arm64/GRDB.SwiftFileList" "/Users/saint/Library/Caches/Xbase/code_gloss/GRDB.build/Debug-iphoneos/GRDB.build/Objects-normal/arm64/GRDB.SwiftFileList"
] ]
}, },
{
"module_name": "GRDBQuery",
"directory": "/Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/GRDBQuery -experimental-emit-module-separately",
"command": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc -module-name GRDBQuery -Onone -enforce-exclusivity\\=checked @/Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/Objects-normal/arm64/GRDBQuery.SwiftFileList -DSWIFT_PACKAGE -DDEBUG -DXcode -sdk /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk -target arm64-apple-ios13.0 -g -Xfrontend -serialize-debugging-options -enable-testing -swift-version 5 -I /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -I /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/lib -F /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -F /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/Frameworks -F /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk/Developer/Library/Frameworks -c -j12 -enable-batch-mode -incremental -output-file-map /Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/Objects-normal/arm64/GRDBQuery-OutputFileMap.json -save-temps -no-color-diagnostics -serialize-diagnostics -emit-dependencies -emit-module -emit-module-path /Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/Objects-normal/arm64/GRDBQuery.swiftmodule -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/swift-overrides.hmap -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos/include -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/DerivedSources-normal/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/DerivedSources/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/DerivedSources -Xcc -DSWIFT_PACKAGE -Xcc -DDEBUG\\=1 -emit-objc-header -emit-objc-header-path /Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/Objects-normal/arm64/GRDBQuery-Swift.h -working-directory /Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/GRDBQuery -experimental-emit-module-separately",
"fileLists": [
"/Users/saint/Library/Caches/Xbase/code_gloss/GRDBQuery.build/Debug-iphoneos/GRDBQuery.build/Objects-normal/arm64/GRDBQuery.SwiftFileList"
]
},
{ {
"module_name": "gloss", "module_name": "gloss",
"directory": "/Users/saint/code/gloss -experimental-emit-module-separately", "directory": "/Users/saint/code/gloss -experimental-emit-module-separately",
"command": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc -module-name gloss -Onone -enforce-exclusivity\\=checked @/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/Objects-normal/arm64/gloss.SwiftFileList -DDEBUG -Xcc -fmodule-map-file\\=/Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/GRDB.swift/Sources/CSQLite/module.modulemap -sdk /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk -target arm64-apple-ios15.0 -enable-bare-slash-regex -g -Xfrontend -serialize-debugging-options -enable-testing -swift-version 5 -I /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -F /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos/PackageFrameworks -F /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos/PackageFrameworks -F /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos/PackageFrameworks -F /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -emit-localized-strings -emit-localized-strings-path /Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/Objects-normal/arm64 -c -j12 -enable-batch-mode -incremental -output-file-map /Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/Objects-normal/arm64/gloss-OutputFileMap.json -use-frontend-parseable-output -save-temps -no-color-diagnostics -serialize-diagnostics -emit-dependencies -emit-module -emit-module-path /Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/Objects-normal/arm64/gloss.swiftmodule -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/swift-overrides.hmap -Xcc -iquote -Xcc /Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/gloss-generated-files.hmap -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/gloss-own-target-headers.hmap -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/gloss-all-non-framework-target-headers.hmap -Xcc -ivfsoverlay -Xcc /Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/all-product-headers.yaml -Xcc -iquote -Xcc /Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/gloss-project-headers.hmap -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos/include -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/DerivedSources-normal/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/DerivedSources/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/DerivedSources -Xcc -DDEBUG\\=1 -emit-objc-header -emit-objc-header-path /Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/Objects-normal/arm64/gloss-Swift.h -working-directory /Users/saint/code/gloss -experimental-emit-module-separately", "command": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc -module-name gloss -Onone -enforce-exclusivity\\=checked @/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/Objects-normal/arm64/gloss.SwiftFileList -DDEBUG -Xcc -fmodule-map-file\\=/Users/saint/Library/Developer/Xcode/DerivedData/gloss-ajphzxkxxghgqicpumudnmcgeuwg/SourcePackages/checkouts/GRDB.swift/Sources/CSQLite/module.modulemap -sdk /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk -target arm64-apple-ios15.0 -enable-bare-slash-regex -g -Xfrontend -serialize-debugging-options -enable-testing -swift-version 5 -I /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -F /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos/PackageFrameworks -F /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos/PackageFrameworks -F /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos/PackageFrameworks -F /Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos -emit-localized-strings -emit-localized-strings-path /Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/Objects-normal/arm64 -c -j12 -enable-batch-mode -incremental -output-file-map /Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/Objects-normal/arm64/gloss-OutputFileMap.json -save-temps -no-color-diagnostics -serialize-diagnostics -emit-dependencies -emit-module -emit-module-path /Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/Objects-normal/arm64/gloss.swiftmodule -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/swift-overrides.hmap -Xcc -iquote -Xcc /Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/gloss-generated-files.hmap -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/gloss-own-target-headers.hmap -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/gloss-all-non-framework-target-headers.hmap -Xcc -ivfsoverlay -Xcc /Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/all-product-headers.yaml -Xcc -iquote -Xcc /Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/gloss-project-headers.hmap -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/Debug-iphoneos/include -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/DerivedSources-normal/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/DerivedSources/arm64 -Xcc -I/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/DerivedSources -Xcc -DDEBUG\\=1 -emit-objc-header -emit-objc-header-path /Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/Objects-normal/arm64/gloss-Swift.h -working-directory /Users/saint/code/gloss -experimental-emit-module-separately",
"fileLists": [ "fileLists": [
"/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/Objects-normal/arm64/gloss.SwiftFileList" "/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/Objects-normal/arm64/gloss.SwiftFileList"
] ]

16
gloss.xcodeproj/xcuserdata/saint.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@ -14,8 +14,8 @@
filePath = "gloss/ContentView.swift" filePath = "gloss/ContentView.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "556" startingLineNumber = "566"
endingLineNumber = "556" endingLineNumber = "566"
landmarkName = "handleVisibilityChanged(_:change:tracker:)" landmarkName = "handleVisibilityChanged(_:change:tracker:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@ -30,8 +30,8 @@
filePath = "gloss/ContentView.swift" filePath = "gloss/ContentView.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "558" startingLineNumber = "568"
endingLineNumber = "558" endingLineNumber = "568"
landmarkName = "handleVisibilityChanged(_:change:tracker:)" landmarkName = "handleVisibilityChanged(_:change:tracker:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@ -46,8 +46,8 @@
filePath = "gloss/ContentView.swift" filePath = "gloss/ContentView.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "457" startingLineNumber = "459"
endingLineNumber = "457" endingLineNumber = "459"
landmarkName = "body" landmarkName = "body"
landmarkType = "24"> landmarkType = "24">
</BreakpointContent> </BreakpointContent>
@ -62,8 +62,8 @@
filePath = "gloss/ContentView.swift" filePath = "gloss/ContentView.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "425" startingLineNumber = "427"
endingLineNumber = "425" endingLineNumber = "427"
landmarkName = "body" landmarkName = "body"
landmarkType = "24"> landmarkType = "24">
</BreakpointContent> </BreakpointContent>

303
gloss/ContentView.swift
View File

@ -27,7 +27,7 @@ extension UserDefaults {
if let value = defaults.value(forKey: defaultName) { if let value = defaults.value(forKey: defaultName) {
return value as? Int return value as? Int
} }
return nil return nil
} }
public func optionalBool(forKey defaultName: String) -> Bool? { public func optionalBool(forKey defaultName: String) -> Bool? {
@ -56,6 +56,7 @@ func goToRibbon(selectedRibbon: Ribbon,
scrollId: Binding<String?>, scrollId: Binding<String?>,
scrollOffset: Binding<CGFloat?>, scrollOffset: Binding<CGFloat?>,
refresh: Binding<Bool>, refresh: Binding<Bool>,
showOverlay: Binding<Bool>,
appDatabase: AppDatabase, appDatabase: AppDatabase,
loading: Bool loading: Bool
) )
@ -71,6 +72,10 @@ func goToRibbon(selectedRibbon: Ribbon,
if (selectedRibbon.id != destRibbon.id! || loading) { if (selectedRibbon.id != destRibbon.id! || loading) {
print("switching ribbons") print("switching ribbons")
// withAnimation(.spring(response: 0.05)) {
showOverlay.wrappedValue = true
// }
if (loading) { if (loading) {
currentId = destRibbon.scrollId currentId = destRibbon.scrollId
// currentOffset = CGFloat(destRibbon.scrollOffset) // currentOffset = CGFloat(destRibbon.scrollOffset)
@ -96,7 +101,7 @@ func goToRibbon(selectedRibbon: Ribbon,
if (!loading) { if (!loading) {
print("not loading") print("not loading")
updatedRibbon.scrollOffset = Int(scrollOffsetToSave!) updatedRibbon.scrollOffset = Int(floor(scrollOffsetToSave!))
updatedRibbon.scrollId = scrollIdToSave! updatedRibbon.scrollId = scrollIdToSave!
_ = try await appDatabase.saveRibbon(&updatedRibbon) _ = try await appDatabase.saveRibbon(&updatedRibbon)
@ -118,6 +123,7 @@ struct SwitchButton : View {
var ribbon: Ribbon var ribbon: Ribbon
@Binding var scrollId : String? @Binding var scrollId : String?
@Binding var scrollOffset : CGFloat? @Binding var scrollOffset : CGFloat?
@Binding var showOverlay : Bool
@Binding var refresh : Bool @Binding var refresh : Bool
@Environment(\.appDatabase) private var appDatabase @Environment(\.appDatabase) private var appDatabase
@ -137,6 +143,7 @@ struct SwitchButton : View {
scrollId: $scrollId, scrollId: $scrollId,
scrollOffset: $scrollOffset, scrollOffset: $scrollOffset,
refresh: $refresh, refresh: $refresh,
showOverlay: $showOverlay,
appDatabase: appDatabase, appDatabase: appDatabase,
loading: false) loading: false)
} }
@ -145,23 +152,8 @@ struct SwitchButton : View {
) )
.buttonStyle(BlueButtonStyle()) .buttonStyle(BlueButtonStyle())
} }
// }
} }
// class ScrollViewHandler: NSObject {
// public var scrollOffset = CGFloat(10)
// }
// extension ScrollViewHandler: UIScrollViewDelegate {
// func scrollViewDidScroll(_ scrollView: UIScrollView) {
// scrollOffset = CGFloat(scrollView.contentOffset.y)
// // print("delegate", scrollView.contentOffset.y)
// // print("delegate prop", self.scrollOffset)
// }
// }
class Verse: NSObject, Codable { class Verse: NSObject, Codable {
var body: String var body: String
var verse: Int var verse: Int
@ -191,9 +183,6 @@ private struct SegRow: View {
var ribbonId: Int64 var ribbonId: Int64
var body: some View { var body: some View {
// makeVerseView(seg: seg)
var retView = Text("") var retView = Text("")
var segSplit = seg.body.components(separatedBy: ";;") var segSplit = seg.body.components(separatedBy: ";;")
let decoder = JSONDecoder() let decoder = JSONDecoder()
@ -212,7 +201,6 @@ private struct SegRow: View {
return result return result
} }
retView = retView + Text(String(verse.verse)) + Text(String(ribbonId)) retView = retView + Text(String(verse.verse)) + Text(String(ribbonId))
//retView = retView + Text(attributedString) //retView = retView + Text(attributedString)
// Text(seg.body) // Text(seg.body)
@ -274,6 +262,7 @@ struct ContentView: View {
@State var scrollOffset: CGFloat? @State var scrollOffset: CGFloat?
@State var setScrollOffset: CGFloat? @State var setScrollOffset: CGFloat?
@State var showOverlay: Bool = false
@Environment(\.appDatabase) private var appDatabase @Environment(\.appDatabase) private var appDatabase
@ -316,14 +305,14 @@ struct ContentView: View {
var size2 = CGFloat(120) var size2 = CGFloat(120)
var fontSize = CGFloat(20) var fontSize = CGFloat(20)
GeometryReader { geometry in GeometryReader { geometry in
ZStack { ZStack (alignment: .top) {
VStack{ VStack{
Text("MK") Text("pp")
.font(Font.custom("AveriaSerifLibre-Regular", size: fontSize)) .font(Font.custom("AveriaSerifLibre-Regular", size: fontSize))
.foregroundColor(Color(UIColor(red: 0.76, green: 0.76, blue: 0.76, alpha: 1.00))) .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)) // .background(Color(red: 0.3, green: 0.3, blue: 0.3))
.overlay( MyCustomShape().frame(width: size1, height: size1) .foregroundColor(Color(UIColor(red: 0.30, green: 0.30, blue: 0.30, alpha: 0.4)))) .overlay( MyCustomShape().frame(width: size1, height: size1) .foregroundColor(Color(UIColor(red: 0.30, green: 0.30, blue: 0.30, alpha: 0.4))))
// .foregroundColor(.white)) // .foregroundColor(.white))
.frame(width: size2, height: size2) .frame(width: size2, height: size2)
Text("Ps") Text("Ps")
@ -331,7 +320,7 @@ struct ContentView: View {
.foregroundColor(Color(UIColor(red: 0.76, green: 0.76, blue: 0.76, alpha: 1.00))) .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)) // .background(Color(red: 0.3, green: 0.3, blue: 0.3))
.overlay( MyCustomShape().frame(width: size1, height: size1) .foregroundColor(Color(UIColor(red: 0.30, green: 0.30, blue: 0.30, alpha: 0.4)))) .overlay( MyCustomShape().frame(width: size1, height: size1) .foregroundColor(Color(UIColor(red: 0.30, green: 0.30, blue: 0.30, alpha: 0.4))))
// .foregroundColor(.white)) // .foregroundColor(.white))
.frame(width: size1, height: size1) .frame(width: size1, height: size1)
Text("Jn") Text("Jn")
@ -339,7 +328,7 @@ struct ContentView: View {
.foregroundColor(Color(UIColor(red: 0.76, green: 0.76, blue: 0.76, alpha: 1.00))) .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)) // .background(Color(red: 0.3, green: 0.3, blue: 0.3))
.overlay( MyCustomShape().frame(width: size1, height: size1) .foregroundColor(Color(UIColor(red: 0.30, green: 0.30, blue: 0.30, alpha: 0.4)))) .overlay( MyCustomShape().frame(width: size1, height: size1) .foregroundColor(Color(UIColor(red: 0.30, green: 0.30, blue: 0.30, alpha: 0.4))))
// .foregroundColor(.white)) // .foregroundColor(.white))
.frame(width: size1, height: size1) .frame(width: size1, height: size1)
@ -354,6 +343,7 @@ struct ContentView: View {
SwitchButton(ribbon: ribbon, SwitchButton(ribbon: ribbon,
scrollId:$scrollId, scrollId:$scrollId,
scrollOffset:$scrollOffset, scrollOffset:$scrollOffset,
showOverlay: $showOverlay,
refresh:$refresh refresh:$refresh
) )
.buttonStyle(BlueButtonStyle()) .buttonStyle(BlueButtonStyle())
@ -363,135 +353,145 @@ struct ContentView: View {
} }
.frame(width: geometry.size.width, height: geometry.size.height, alignment: .topLeading) .frame(width: geometry.size.width, height: geometry.size.height, alignment: .topLeading)
.background(Color(red: 0.1, green: 0.1, blue: 0.1)) .background(Color(red: 0.1, green: 0.1, blue: 0.1))
.zIndex(0)
ScrollViewReader { proxy in ScrollViewReader { proxy in
VisibilityTrackingScrollView(action: handleVisibilityChanged) { VisibilityTrackingScrollView(action: handleVisibilityChanged) {
// ScrollView { // ScrollView {
LazyVStack { LazyVStack {
Text(refresh ? "Selected" : "not Selected") Text(refresh ? "Selected" : "not Selected")
Button("Jump to #8") { Button("Jump to #8") {
scrollId = "20" scrollId = "20"
}
ForEach(segs) { seg in
SegRow(seg: seg,
ribbonId: selectedRibbon[0].id!
)
.id("\(seg.id)")
.padding(EdgeInsets(top: 10, leading: 20, bottom: 40, trailing: 20))
.trackVisibility(id: "\(seg.id)")
// .onChange(of: geometry.frame(in: .named("scrollView"))) { imageRect in
//Print(imageRect)
//Print(outerProxy)
// if isInView(innerRect: imageRect, isIn: outerProxy) {
// visibleIndex.insert(item)
// } else {
// visibleIndex.remove(item)
// }
// }
}
} }
.background(Color(red: 0.2, green: 0.2, blue: 0.2)) ForEach(segs) { seg in
} SegRow(seg: seg,
ribbonId: selectedRibbon[0].id!
)
.id("\(seg.id)")
.onAppear() { .padding(EdgeInsets(top: 10, leading: 20, bottom: 40, trailing: 20))
Print("APPEAR") .trackVisibility(id: "\(seg.id)")
// Print(selectedRibbon[0])
// scrollId = "3"
// scrollOffset = 103
// refresh.toggle()
goToRibbon(selectedRibbon: selectedRibbon[0], // .onChange(of: geometry.frame(in: .named("scrollView"))) { imageRect in
destRibbon: selectedRibbon[0], //Print(imageRect)
scrollId: $scrollId, //Print(outerProxy)
scrollOffset: $scrollOffset, // if isInView(innerRect: imageRect, isIn: outerProxy) {
refresh: $refresh, // visibleIndex.insert(item)
appDatabase: appDatabase, // } else {
loading: true) // visibleIndex.remove(item)
// }
}
.onChange(of: refresh) { target in
//if let target = target {
//gTracker!.visibleViews["123123"] = CGFloat(100)
// Print("ON CHANGE", gTracker!.visibleViews)
// Print("removing", gTracker!.visibleViews.removeAll())
Task {
DispatchQueue.main.async {
Print("scroll Id target: \(scrollId)")
proxy.scrollTo(scrollId! , anchor: .top)
// proxy.scrollTo(String(Int(scrollId!)! + 1))
// currentId = scrollId!
// if (currentId != scrollId!) {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
Print(" scroll id target", scrollId)
Print(" current id ", currentId)
Print(gTracker!.sortedViewIDs)
if (currentId! != scrollId!) {
Print("NO MATCH")
}
// Print(" scroll offset target", scrollOffset)
Print(" current offset ", gTracker!.visibleViews[scrollId!])
var curOffset = gTracker!.visibleViews[scrollId!]
Print(" stats", gTracker!.visibleViews)
// // setScrollOffset = CGFloat(Int(currentOffset!) * -1 + Int(scrollOffset!))
if (curOffset != nil) {
setScrollOffset = CGFloat(Int(scrollOffset!) - Int(curOffset!))
Print("applying scroll offset \(setScrollOffset)")
// // setScrollOffset = CGFloat(Int(scrollOffset!))
// Print("setting scroll offset", setScrollOffset)
refresh2.toggle()
} else {
var adjust = (Int(scrollId!)! - Int(currentId!)!) * 200
Print("adjusting \(adjust)")
setScrollOffset = CGFloat(adjust)
refresh.toggle()
}
// // currentId = scrollId!
// DispatchQueue.main.async {
// currentOffset = scrollOffset!
// currentId = scrollId!
// } // }
} }
} }
} .background(Color(red: 0.2, green: 0.2, blue: 0.2))
}
.introspectScrollView { scrollView in
Print("introspect")
// scrollView.delegate = scrollDelegate
//Print("Scroll delegate offset", scrollDelegate.scrollOffset)
if (setScrollOffset != nil) {
// Print("Setting scroll offset in introspect", setScrollOffset)
scrollView.contentOffset.y = scrollView.contentOffset.y + setScrollOffset!
DispatchQueue.main.async { setScrollOffset = nil }
} }
// if (thisScrollView == nil) { .onAppear() {
// Print("init scroll") Print("APPEAR")
// thisScrollView = scrollView // Print(selectedRibbon[0])
// scrollView.contentOffset.y = CGFloat(selectedRibbon[0].scrollOffset) // scrollId = "3"
// } // scrollOffset = 103
Print("end instrospect") // refresh.toggle()
}
.listStyle(PlainListStyle()) goToRibbon(selectedRibbon: selectedRibbon[0],
destRibbon: selectedRibbon[0],
scrollId: $scrollId,
scrollOffset: $scrollOffset,
refresh: $refresh,
showOverlay: $showOverlay,
appDatabase: appDatabase,
loading: true)
}
.onChange(of: refresh) { target in
//if let target = target {
//gTracker!.visibleViews["123123"] = CGFloat(100)
// Print("ON CHANGE", gTracker!.visibleViews)
// Print("removing", gTracker!.visibleViews.removeAll())
Task {
DispatchQueue.main.async {
Print("scroll Id target: \(scrollId)")
proxy.scrollTo(scrollId! , anchor: .top)
// proxy.scrollTo(String(Int(scrollId!)! + 1))
// currentId = scrollId!
// if (currentId != scrollId!) {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
Print(" scroll id target", scrollId)
Print(" current id ", currentId)
Print(gTracker!.sortedViewIDs)
if (currentId! != scrollId!) {
Print("NO MATCH")
}
// Print(" scroll offset target", scrollOffset)
Print(" current offset ", gTracker!.visibleViews[scrollId!])
var curOffset = gTracker!.visibleViews[scrollId!]
Print(" stats", gTracker!.visibleViews)
// // setScrollOffset = CGFloat(Int(currentOffset!) * -1 + Int(scrollOffset!))
if (curOffset != nil) {
setScrollOffset = CGFloat(Int(scrollOffset!) - Int(curOffset!))
Print("applying scroll offset \(setScrollOffset)")
// // setScrollOffset = CGFloat(Int(scrollOffset!))
// Print("setting scroll offset", setScrollOffset)
refresh2.toggle()
} else {
var adjust = (Int(scrollId!)! - Int(currentId!)!) * 200
Print("adjusting \(adjust)")
setScrollOffset = CGFloat(adjust)
refresh.toggle()
}
// // currentId = scrollId!
// DispatchQueue.main.async {
// currentOffset = scrollOffset!
// currentId = scrollId!
// }
}
}
}
}
.introspectScrollView { scrollView in
Print("introspect")
// scrollView.delegate = scrollDelegate
//Print("Scroll delegate offset", scrollDelegate.scrollOffset)
if (setScrollOffset != nil) {
// Print("Setting scroll offset in introspect", setScrollOffset)
DispatchQueue.main.async {
scrollView.contentOffset.y = scrollView.contentOffset.y + setScrollOffset!
setScrollOffset = nil
withAnimation {
showOverlay = false
}
}
}
// if (thisScrollView == nil) {
// Print("init scroll")
// thisScrollView = scrollView
// scrollView.contentOffset.y = CGFloat(selectedRibbon[0].scrollOffset)
// }
Print("end instrospect")
}
.listStyle(PlainListStyle())
} }
.zIndex(1)
.background(Color(red: 0.2, green: 0.2, blue: 0.2)) .background(Color(red: 0.2, green: 0.2, blue: 0.2))
.frame(width: geometry.size.width - 50) .frame(width: geometry.size.width - 50)
.offset(x:30 , y:0) .offset(x:30 , y:0)
@ -531,7 +531,28 @@ struct ContentView: View {
} }
} }
) )
if (showOverlay) {
Rectangle()
.frame(width: geometry.size.width - 50, height: geometry.size.height + 200)
.background(.ultraThinMaterial)
//.blur(radius: 0.8)
.offset(x:30, y:-100 )
.opacity(0.98)
.transition(.opacity)
// .frame(width: geometry.size.width - 50)
.offset(x: pulledOut.width)
.offset(x: viewState.width, y: viewState.height)
.zIndex(2)
}
} }
} }
} }