mirror of
https://github.com/leonboe1/QuickDrop.git
synced 2026-11-11 02:51:11 +00:00
Auto quit qr window for new device
This commit is contained in:
1 parent
da4dd4cc79
commit
2b0b7113c2
4 files changed
+20
-14
No files matched your search
@@ -52,6 +52,7 @@
|
||||
EB96ED8F2D7F8105004B3FF1 /* Localized.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB96ED8E2D7F8103004B3FF1 /* Localized.swift */; };
|
||||
EB96ED902D7F8114004B3FF1 /* Localized.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB96ED8E2D7F8103004B3FF1 /* Localized.swift */; };
|
||||
EBCC27F92D80C9F90079C478 /* Zip.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBCC27F82D80C9F70079C478 /* Zip.swift */; };
|
||||
EBCC29012D8202F90079C478 /* ShareViewControllerSwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB96ED882D7F79B9004B3FF1 /* ShareViewControllerSwiftUI.swift */; };
|
||||
EBD2A2172D2860C100BCB8E2 /* WelcomeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBD2A2162D2860BE00BCB8E2 /* WelcomeScreen.swift */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
@@ -535,6 +536,7 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
EBCC29012D8202F90079C478 /* ShareViewControllerSwiftUI.swift in Sources */,
|
||||
EBD2A2172D2860C100BCB8E2 /* WelcomeScreen.swift in Sources */,
|
||||
EB3643602D73A2A2009CDFF8 /* AudioManager.swift in Sources */,
|
||||
EB96ED8C2D7F7E7B004B3FF1 /* QrCodeView.swift in Sources */,
|
||||
|
||||
@@ -38,11 +38,11 @@ struct QrCodeView: View {
|
||||
|
||||
Spacer()
|
||||
}
|
||||
.frame(width: qrCodeViewSize.width, height: qrCodeViewSize.height)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#Preview {
|
||||
QrCodeView()
|
||||
.frame(width: qrCodeViewSize.width, height: qrCodeViewSize.height)
|
||||
}
|
||||
@@ -245,6 +245,8 @@ class ShareViewController: NSViewController, ShareExtensionDelegate{
|
||||
}
|
||||
foundDevices.append(device)
|
||||
listView?.animator().insertItems(at: [[0, foundDevices.count-1]])
|
||||
|
||||
qrWindow?.close()
|
||||
}
|
||||
|
||||
func removeDevice(id: String){
|
||||
|
||||
@@ -15,18 +15,7 @@
|
||||
// private let viewModel = ShareViewModel()
|
||||
//
|
||||
// override func loadView() {
|
||||
// self.view = NSHostingView(rootView: ShareView(viewModel: viewModel))
|
||||
// }
|
||||
//
|
||||
// override func viewDidLoad() {
|
||||
// super.viewDidLoad()
|
||||
// NearbyConnectionManager.shared.startDeviceDiscovery()
|
||||
// NearbyConnectionManager.shared.addShareExtensionDelegate(viewModel)
|
||||
// }
|
||||
//
|
||||
// override func viewWillDisappear() {
|
||||
// NearbyConnectionManager.shared.stopDeviceDiscovery()
|
||||
// NearbyConnectionManager.shared.removeShareExtensionDelegate(viewModel)
|
||||
// self.view = NSHostingView(rootView: ShareView())
|
||||
// }
|
||||
//}
|
||||
//
|
||||
@@ -97,7 +86,7 @@
|
||||
//import SwiftUI
|
||||
//
|
||||
//struct ShareView: View {
|
||||
// @ObservedObject var viewModel: ShareViewModel
|
||||
// @StateObject var viewModel: ShareViewModel = ShareViewModel()
|
||||
//
|
||||
// var body: some View {
|
||||
// VStack(spacing: 20) {
|
||||
@@ -123,6 +112,14 @@
|
||||
// .padding()
|
||||
// }
|
||||
// .padding()
|
||||
// .onAppear {
|
||||
// NearbyConnectionManager.shared.startDeviceDiscovery()
|
||||
// NearbyConnectionManager.shared.addShareExtensionDelegate(viewModel)
|
||||
// }
|
||||
// .onDisappear {
|
||||
// NearbyConnectionManager.shared.stopDeviceDiscovery()
|
||||
// NearbyConnectionManager.shared.removeShareExtensionDelegate(viewModel)
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private func deviceImageName(for type: RemoteDeviceInfo.DeviceType) -> String {
|
||||
@@ -136,3 +133,8 @@
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
//
|
||||
//
|
||||
//#Preview {
|
||||
// ShareView()
|
||||
//}
|
||||
Reference in new issue
Block a user