Postpone permission prompt after introduction

This commit is contained in:
Leon Böttger committed 2025-08-18 14:48:31 +02:00
1 parent 22e86bc4f5
commit cecffa1aaa
2 files changed
+93 -88

No files matched your search

+92 -87
View File
@@ -10,7 +10,7 @@ import LUI
struct ContentView: View { struct ContentView: View {
@Environment(\.scenePhase) var scenePhase @ObservedObject var luiSettings = LUISettings.sharedInstance
var body: some View { var body: some View {
AppRootView(isPlus: .constant(true), phoneView: { AppRootView(isPlus: .constant(true), phoneView: {
@@ -25,21 +25,6 @@ struct ContentView: View {
} }
} }
}) })
.onChange(of: scenePhase) { newValue in
if newValue == .active {
#if !EXTENSION
NearbyConnectionManager.shared.becomeVisible()
#endif
NearbyConnectionManager.shared.startDeviceDiscovery()
}
if newValue == .background {
#if !EXTENSION
NearbyConnectionManager.shared.becomeInvisible()
#endif
NearbyConnectionManager.shared.stopDeviceDiscovery()
}
}
} }
} }
@@ -51,107 +36,127 @@ struct DeviceListView: View {
@StateObject var receiveModel = ReceiveModel() @StateObject var receiveModel = ReceiveModel()
#endif #endif
@Environment(\.scenePhase) var scenePhase
@ObservedObject var nearbyConnectionManager = NearbyConnectionManager.shared @ObservedObject var nearbyConnectionManager = NearbyConnectionManager.shared
var body: some View { var body: some View {
NavigationSubView(header: "QuickDrop ", navigationBarLayout: isShareExtension() ? .SmallOnlyAlways : .Default) { NavigationSubView(header: "QuickDrop ", navigationBarLayout: isShareExtension() ? .SmallOnlyAlways : .Default) {
VStack {
VStack(alignment: .leading, spacing: 8) {
VStack(alignment: .leading, spacing: 8) { let attachments = nearbyConnectionManager.attachments
let attachments = nearbyConnectionManager.attachments FooterView(text: attachments == nil ? "YouAreVisibleAs".localized() : "YouAreSending".localized())
FooterView(text: attachments == nil ? "YouAreVisibleAs".localized() : "YouAreSending".localized())
HStack {
if let image = attachments?.previewImage {
image
.resizable()
.scaledToFill()
.frame(width: 10, height: 10)
}
LUIText(attachments?.shortDescription ?? NearbyConnectionManager.shared.deviceInfo.name ?? "Unknown".localized(), isBold: true)
.lineLimit(1)
}
.padding(.horizontal, 16)
.padding(.vertical, 6)
.background(Color.defaultForegroundColor)
.cornerRadius(24)
.padding(.horizontal)
}
.padding(.top, 8)
.frame(maxWidth: .infinity, alignment: .leading)
if !nearbyConnectionManager.hasLocalNetworkAccess {
CardView(backgroundColor: .red, title: "NoNetworkAccess", titleSymbol: "network.slash") {
HStack { HStack {
if let image = attachments?.previewImage {
image
.resizable()
.scaledToFill()
.frame(width: 10, height: 10)
}
LUIText(attachments?.shortDescription ?? NearbyConnectionManager.shared.deviceInfo.name ?? "Unknown".localized(), isBold: true)
.lineLimit(1)
}
.padding(.horizontal, 16)
.padding(.vertical, 6)
.background(Color.defaultForegroundColor)
.cornerRadius(24)
.padding(.horizontal)
}
.padding(.top, 8)
.frame(maxWidth: .infinity, alignment: .leading)
if !nearbyConnectionManager.hasLocalNetworkAccess {
CardView(backgroundColor: .red, title: "NoNetworkAccess", titleSymbol: "network.slash") {
CardSubView(symbol: "exclamationmark.triangle.fill", text: "NoLocalNetworkAccessDescription") CardSubView(symbol: "exclamationmark.triangle.fill", text: "NoLocalNetworkAccessDescription")
}
.padding(.bottom, 10)
.onTapGesture {
openAppSettings()
} }
} }
.padding(.bottom, 10)
.onTapGesture {
openAppSettings()
}
}
if sendModel.foundDevices.isEmpty { if sendModel.foundDevices.isEmpty {
CustomSection(header: "NoDevicesFound") { CustomSection(header: "NoDevicesFound") {
HStack(spacing: 12) { HStack(spacing: 12) {
Image(systemName: "square.and.arrow.down") Image(systemName: "square.and.arrow.down")
.font(.system(size: 30)) .font(.system(size: 30))
.foregroundColor(.gray) .foregroundColor(.gray)
.padding(.leading, -10) .padding(.leading, -10)
Text("DownloadQuickDropOnPlayStore") Text("DownloadQuickDropOnPlayStore")
}
.padding(.vertical)
} }
.padding(.vertical)
}
} else { } else {
CustomSection(header: "AvailableDevices") { CustomSection(header: "AvailableDevices") {
ForEach(sendModel.foundDevices) { device in ForEach(sendModel.foundDevices) { device in
let isSelected = sendModel.selectedDevice == device let isSelected = sendModel.selectedDevice == device
ZStack { ZStack {
if let attachments = NearbyConnectionManager.shared.attachments { if let attachments = NearbyConnectionManager.shared.attachments {
LUIButton { LUIButton {
lightVibration() lightVibration()
sendModel.urls = attachments.urls sendModel.urls = attachments.urls
sendModel.textToSend = attachments.textToSend sendModel.textToSend = attachments.textToSend
sendModel.selectDevice(device: device) sendModel.selectDevice(device: device)
} label: { } label: {
DeviceButtonLabel(device: device, isSelected: isSelected, progress: sendModel.progressState, progressValue: sendModel.progressValue) DeviceButtonLabel(device: device, isSelected: isSelected, progress: sendModel.progressState, progressValue: sendModel.progressValue)
}
}
else {
DeviceFilePickerButton(device: device, isSelected: isSelected, progressState: sendModel.progressState, progressValue: sendModel.progressValue, sendModel: sendModel)
} }
} }
else { .animation(.easeInOut, value: sendModel.progressValue)
DeviceFilePickerButton(device: device, isSelected: isSelected, progressState: sendModel.progressState, progressValue: sendModel.progressValue, sendModel: sendModel) .animation(.easeInOut, value: isSelected)
}
} }
.animation(.easeInOut, value: sendModel.progressValue)
.animation(.easeInOut, value: isSelected)
} }
} }
if nearbyConnectionManager.hasLocalNetworkAccess {
HStack(spacing: 8) {
Text("SearchingForDevices")
.font(.system(size: 14))
.foregroundColor(Color.primary.opacity(0.6))
ProgressView()
.frame(width: 12, height: 12)
}
.padding(.vertical, 16)
}
}
.frame(maxWidth: 700)
}
.onChange(of: scenePhase) { newValue in
if newValue == .active {
log("App became active")
#if !EXTENSION
NearbyConnectionManager.shared.becomeVisible()
#endif
NearbyConnectionManager.shared.startDeviceDiscovery()
} }
if newValue == .background {
if nearbyConnectionManager.hasLocalNetworkAccess { log("App went to background")
HStack(spacing: 8) { #if !EXTENSION
Text("SearchingForDevices") NearbyConnectionManager.shared.becomeInvisible()
.font(.system(size: 14)) #endif
.foregroundColor(Color.primary.opacity(0.6)) NearbyConnectionManager.shared.stopDeviceDiscovery()
ProgressView()
.frame(width: 12, height: 12)
}
.padding(.vertical, 16)
} }
} }
.animation(.smooth, value: nearbyConnectionManager.hasLocalNetworkAccess) .animation(.smooth, value: nearbyConnectionManager.hasLocalNetworkAccess)
+1 -1
View File
@@ -7,4 +7,4 @@
*/ */
NSLocalNetworkUsageDescription = "Der Zugriff auf das lokale Netzwerk ist erforderlich, um Geräte zu erkennen und Dateien über Ihr Wi-Fi-Netzwerk zu übertragen."; NSLocalNetworkUsageDescription = "Der Zugriff auf das lokale Netzwerk ist erforderlich, um Geräte zu erkennen und Dateien über WLAN zu übertragen.";