working for now
Saint
parent
d04f004361
commit
28e780e9b7
22
.compile
22
.compile
|
|
@ -2,31 +2,31 @@
|
|||
{
|
||||
"module_name": "Introspect",
|
||||
"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": [
|
||||
"/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",
|
||||
"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": [
|
||||
"/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",
|
||||
"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": [
|
||||
"/Users/saint/Library/Caches/Xbase/code_gloss/gloss.build/Debug-iphoneos/gloss.build/Objects-normal/arm64/gloss.SwiftFileList"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
filePath = "gloss/ContentView.swift"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "556"
|
||||
endingLineNumber = "556"
|
||||
startingLineNumber = "566"
|
||||
endingLineNumber = "566"
|
||||
landmarkName = "handleVisibilityChanged(_:change:tracker:)"
|
||||
landmarkType = "7">
|
||||
</BreakpointContent>
|
||||
|
|
@ -30,8 +30,8 @@
|
|||
filePath = "gloss/ContentView.swift"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "558"
|
||||
endingLineNumber = "558"
|
||||
startingLineNumber = "568"
|
||||
endingLineNumber = "568"
|
||||
landmarkName = "handleVisibilityChanged(_:change:tracker:)"
|
||||
landmarkType = "7">
|
||||
</BreakpointContent>
|
||||
|
|
@ -46,8 +46,8 @@
|
|||
filePath = "gloss/ContentView.swift"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "457"
|
||||
endingLineNumber = "457"
|
||||
startingLineNumber = "459"
|
||||
endingLineNumber = "459"
|
||||
landmarkName = "body"
|
||||
landmarkType = "24">
|
||||
</BreakpointContent>
|
||||
|
|
@ -62,8 +62,8 @@
|
|||
filePath = "gloss/ContentView.swift"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "425"
|
||||
endingLineNumber = "425"
|
||||
startingLineNumber = "427"
|
||||
endingLineNumber = "427"
|
||||
landmarkName = "body"
|
||||
landmarkType = "24">
|
||||
</BreakpointContent>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ extension UserDefaults {
|
|||
if let value = defaults.value(forKey: defaultName) {
|
||||
return value as? Int
|
||||
}
|
||||
return nil
|
||||
return nil
|
||||
}
|
||||
|
||||
public func optionalBool(forKey defaultName: String) -> Bool? {
|
||||
|
|
@ -56,6 +56,7 @@ func goToRibbon(selectedRibbon: Ribbon,
|
|||
scrollId: Binding<String?>,
|
||||
scrollOffset: Binding<CGFloat?>,
|
||||
refresh: Binding<Bool>,
|
||||
showOverlay: Binding<Bool>,
|
||||
appDatabase: AppDatabase,
|
||||
loading: Bool
|
||||
)
|
||||
|
|
@ -70,6 +71,10 @@ func goToRibbon(selectedRibbon: Ribbon,
|
|||
|
||||
if (selectedRibbon.id != destRibbon.id! || loading) {
|
||||
print("switching ribbons")
|
||||
|
||||
// withAnimation(.spring(response: 0.05)) {
|
||||
showOverlay.wrappedValue = true
|
||||
// }
|
||||
|
||||
if (loading) {
|
||||
currentId = destRibbon.scrollId
|
||||
|
|
@ -96,7 +101,7 @@ func goToRibbon(selectedRibbon: Ribbon,
|
|||
|
||||
if (!loading) {
|
||||
print("not loading")
|
||||
updatedRibbon.scrollOffset = Int(scrollOffsetToSave!)
|
||||
updatedRibbon.scrollOffset = Int(floor(scrollOffsetToSave!))
|
||||
updatedRibbon.scrollId = scrollIdToSave!
|
||||
|
||||
_ = try await appDatabase.saveRibbon(&updatedRibbon)
|
||||
|
|
@ -118,6 +123,7 @@ struct SwitchButton : View {
|
|||
var ribbon: Ribbon
|
||||
@Binding var scrollId : String?
|
||||
@Binding var scrollOffset : CGFloat?
|
||||
@Binding var showOverlay : Bool
|
||||
@Binding var refresh : Bool
|
||||
|
||||
@Environment(\.appDatabase) private var appDatabase
|
||||
|
|
@ -137,6 +143,7 @@ struct SwitchButton : View {
|
|||
scrollId: $scrollId,
|
||||
scrollOffset: $scrollOffset,
|
||||
refresh: $refresh,
|
||||
showOverlay: $showOverlay,
|
||||
appDatabase: appDatabase,
|
||||
loading: false)
|
||||
}
|
||||
|
|
@ -145,23 +152,8 @@ struct SwitchButton : View {
|
|||
)
|
||||
.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 {
|
||||
var body: String
|
||||
var verse: Int
|
||||
|
|
@ -191,9 +183,6 @@ private struct SegRow: View {
|
|||
var ribbonId: Int64
|
||||
|
||||
var body: some View {
|
||||
// makeVerseView(seg: seg)
|
||||
|
||||
|
||||
var retView = Text("")
|
||||
var segSplit = seg.body.components(separatedBy: ";;")
|
||||
let decoder = JSONDecoder()
|
||||
|
|
@ -212,7 +201,6 @@ private struct SegRow: View {
|
|||
return result
|
||||
}
|
||||
|
||||
|
||||
retView = retView + Text(String(verse.verse)) + Text(String(ribbonId))
|
||||
//retView = retView + Text(attributedString)
|
||||
// Text(seg.body)
|
||||
|
|
@ -274,6 +262,7 @@ struct ContentView: View {
|
|||
@State var scrollOffset: CGFloat?
|
||||
|
||||
@State var setScrollOffset: CGFloat?
|
||||
@State var showOverlay: Bool = false
|
||||
|
||||
|
||||
@Environment(\.appDatabase) private var appDatabase
|
||||
|
|
@ -316,14 +305,14 @@ struct ContentView: View {
|
|||
var size2 = CGFloat(120)
|
||||
var fontSize = CGFloat(20)
|
||||
GeometryReader { geometry in
|
||||
ZStack {
|
||||
ZStack (alignment: .top) {
|
||||
VStack{
|
||||
Text("MK")
|
||||
Text("pp")
|
||||
.font(Font.custom("AveriaSerifLibre-Regular", size: fontSize))
|
||||
.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))
|
||||
.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)
|
||||
|
||||
Text("Ps")
|
||||
|
|
@ -331,7 +320,7 @@ struct ContentView: View {
|
|||
.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))
|
||||
.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)
|
||||
|
||||
Text("Jn")
|
||||
|
|
@ -339,7 +328,7 @@ struct ContentView: View {
|
|||
.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))
|
||||
.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)
|
||||
|
||||
|
||||
|
|
@ -354,6 +343,7 @@ struct ContentView: View {
|
|||
SwitchButton(ribbon: ribbon,
|
||||
scrollId:$scrollId,
|
||||
scrollOffset:$scrollOffset,
|
||||
showOverlay: $showOverlay,
|
||||
refresh:$refresh
|
||||
)
|
||||
.buttonStyle(BlueButtonStyle())
|
||||
|
|
@ -363,135 +353,145 @@ struct ContentView: View {
|
|||
}
|
||||
.frame(width: geometry.size.width, height: geometry.size.height, alignment: .topLeading)
|
||||
.background(Color(red: 0.1, green: 0.1, blue: 0.1))
|
||||
.zIndex(0)
|
||||
|
||||
ScrollViewReader { proxy in
|
||||
VisibilityTrackingScrollView(action: handleVisibilityChanged) {
|
||||
VisibilityTrackingScrollView(action: handleVisibilityChanged) {
|
||||
// ScrollView {
|
||||
|
||||
LazyVStack {
|
||||
Text(refresh ? "Selected" : "not Selected")
|
||||
Button("Jump to #8") {
|
||||
scrollId = "20"
|
||||
LazyVStack {
|
||||
Text(refresh ? "Selected" : "not Selected")
|
||||
Button("Jump to #8") {
|
||||
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() {
|
||||
Print("APPEAR")
|
||||
// Print(selectedRibbon[0])
|
||||
// scrollId = "3"
|
||||
// scrollOffset = 103
|
||||
// refresh.toggle()
|
||||
.padding(EdgeInsets(top: 10, leading: 20, bottom: 40, trailing: 20))
|
||||
.trackVisibility(id: "\(seg.id)")
|
||||
|
||||
goToRibbon(selectedRibbon: selectedRibbon[0],
|
||||
destRibbon: selectedRibbon[0],
|
||||
scrollId: $scrollId,
|
||||
scrollOffset: $scrollOffset,
|
||||
refresh: $refresh,
|
||||
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!
|
||||
// .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)
|
||||
// }
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.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 }
|
||||
.background(Color(red: 0.2, green: 0.2, blue: 0.2))
|
||||
}
|
||||
|
||||
// if (thisScrollView == nil) {
|
||||
// Print("init scroll")
|
||||
// thisScrollView = scrollView
|
||||
// scrollView.contentOffset.y = CGFloat(selectedRibbon[0].scrollOffset)
|
||||
// }
|
||||
Print("end instrospect")
|
||||
}
|
||||
.listStyle(PlainListStyle())
|
||||
.onAppear() {
|
||||
Print("APPEAR")
|
||||
// Print(selectedRibbon[0])
|
||||
// scrollId = "3"
|
||||
// scrollOffset = 103
|
||||
// refresh.toggle()
|
||||
|
||||
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))
|
||||
.frame(width: geometry.size.width - 50)
|
||||
.offset(x:30 , y:0)
|
||||
|
|
@ -523,7 +523,7 @@ struct ContentView: View {
|
|||
}
|
||||
else if abs(viewState.width + pulledOut.width ) > 30 {
|
||||
pulledOutWidth = CGFloat(200)
|
||||
}
|
||||
}
|
||||
|
||||
withAnimation(.spring(response: 0.2)) {
|
||||
pulledOut.width = pulledOutWidth
|
||||
|
|
@ -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)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue