diff --git a/QuickDrop.xcodeproj/project.pbxproj b/QuickDrop.xcodeproj/project.pbxproj index e5aaeaf..96eb93c 100644 --- a/QuickDrop.xcodeproj/project.pbxproj +++ b/QuickDrop.xcodeproj/project.pbxproj @@ -1739,7 +1739,7 @@ MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; - SHARED_BUILD = 120; + SHARED_BUILD = 122; SHARED_VERSION = 2.13; STRING_CATALOG_GENERATE_SYMBOLS = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -1802,7 +1802,7 @@ MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = macosx; - SHARED_BUILD = 120; + SHARED_BUILD = 122; SHARED_VERSION = 2.13; STRING_CATALOG_GENERATE_SYMBOLS = YES; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/QuickDrop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/QuickDrop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 04866f2..db24852 100644 --- a/QuickDrop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/QuickDrop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -52,7 +52,7 @@ "location" : "https://github.com/leonboe1/LUI.git", "state" : { "branch" : "main", - "revision" : "ecd2793fdf678fa80de2f528589b3c11cac4f1d4" + "revision" : "0cf19849a8b1779453e54558ce968f5f1c30e92a" } }, { diff --git a/QuickDrop/View/Toast/QuickDropToastView.swift b/QuickDrop/View/Toast/QuickDropToastView.swift index 3ba10dc..e4b066e 100644 --- a/QuickDrop/View/Toast/QuickDropToastView.swift +++ b/QuickDrop/View/Toast/QuickDropToastView.swift @@ -192,7 +192,6 @@ struct QuickDropToastView: View { } } } - } .padding(.leading, 16) .frame(width: toastViewSize.width, height: toastViewSize.height) @@ -255,6 +254,7 @@ struct QuickDropToastView: View { } } + struct QuickDropToastHostView: View { @ObservedObject var receiveModel: ReceiveModel let onCancel: () -> Void @@ -295,6 +295,7 @@ fileprivate struct QuickDropToastViewButton: View { } } + fileprivate struct QuickDropToastViewMenuButton: View { let title: String @ViewBuilder let content: () -> Content @@ -306,9 +307,11 @@ fileprivate struct QuickDropToastViewMenuButton: View { ToastButtonLabel(title: title, fillsWidth: false) } .menuStyle(.borderlessButton) + .padding(.horizontal, 6) } } + fileprivate struct ToastButtonLabel: View { let title: String let fillsWidth: Bool @@ -325,6 +328,7 @@ fileprivate struct ToastButtonLabel: View { } } + fileprivate struct ActionColumn: View { let width: CGFloat @ViewBuilder let content: () -> Content @@ -345,6 +349,7 @@ fileprivate struct ActionColumn: View { } } + fileprivate struct ActionButtonRow: View { @ViewBuilder let content: () -> Content @@ -354,6 +359,7 @@ fileprivate struct ActionButtonRow: View { } } + fileprivate struct ActionDividerLine: View { var body: some View { Rectangle() @@ -455,6 +461,7 @@ struct QuickDropToastView_Previews: PreviewProvider { } } + struct ConsentDemo2: View { @State var model = ReceiveModel(controlPlusScreen: { _ in }) @@ -479,6 +486,7 @@ struct QuickDropToastView_Previews: PreviewProvider { } } } + struct ProgressDemo: View { @State var model = ReceiveModel(controlPlusScreen: { _ in }) @@ -498,6 +506,7 @@ struct QuickDropToastView_Previews: PreviewProvider { } } } + struct CompletedDemo: View { @State var model = ReceiveModel(controlPlusScreen: { _ in }) @@ -517,6 +526,7 @@ struct QuickDropToastView_Previews: PreviewProvider { } } } + private static let previewWallpaper = LinearGradient( gradient: Gradient(colors: [ @@ -527,6 +537,7 @@ struct QuickDropToastView_Previews: PreviewProvider { startPoint: .topLeading, endPoint: .bottomTrailing ) + static var previews: some View { Group {