external/secretive
1
0
Fork 0
mirror of https://github.com/maxgoedjen/secretive.git synced 2025-08-30 17:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Put back UI changes

Browse Source
This commit is contained in:
Max Goedjen 2025-08-24 20:01:55 -07:00
parent 9b3038c440
commit 8174576444
No known key found for this signature in database
2 changed files with 13 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Sources/Secretive/Views/CopyableView.swift
View File

@ -8,9 +8,7 @@ struct CopyableView: View {
var text: String
@State private var interactionState: InteractionState = .normal
@State private var expanded = false
@State private var showExpand = false
var content: some View {
VStack(alignment: .leading) {
HStack {
@ -33,50 +31,17 @@ struct CopyableView: View {
}
.padding(EdgeInsets(top: 20, leading: 20, bottom: 10, trailing: 20))
Divider()
textView
.lineLimit(expanded ? nil : 5)
.overlay {
ViewThatFits {
textView
.hidden()
.onAppear {
showExpand = false
}
Spacer()
.onAppear {
showExpand = true
}
}
}
.overlay(alignment: .bottomTrailing) {
if showExpand {
if #available(macOS 26.0, *) {
Button("Test", systemImage: "rectangle.expand.vertical") {
expanded = true
showExpand = false
}
.labelStyle(.iconOnly)
.buttonBorderShape(.circle)
.buttonStyle(.glass)
.padding()
} else {
}
}
}
Text(text)
.fixedSize(horizontal: false, vertical: true)
.foregroundColor(primaryTextColor)
.padding(EdgeInsets(top: 10, leading: 20, bottom: 20, trailing: 20))
.multilineTextAlignment(.leading)
.font(.system(.body, design: .monospaced))
}
._background(interactionState: interactionState)
.frame(minWidth: 150, maxWidth: .infinity)
}
var textView: some View {
Text(text)
.fixedSize(horizontal: false, vertical: true)
.foregroundColor(primaryTextColor)
.padding(EdgeInsets(top: 10, leading: 20, bottom: 20, trailing: 20))
.multilineTextAlignment(.leading)
.font(.system(.body, design: .monospaced))
}
var body: some View {
content
.onHover { hovering in
@ -84,10 +49,10 @@ struct CopyableView: View {
interactionState = hovering ? .hovering : .normal
}
}
.draggable(text, preview: {
content
.lineLimit(3)
.frame(maxWidth: 300)
.onDrag({
NSItemProvider(item: NSData(data: text.data(using: .utf8)!), typeIdentifier: UTType.utf8PlainText.identifier)
}, preview: {
content
._background(interactionState: .dragging)
})
.onTapGesture {
@ -205,7 +170,7 @@ struct CopyableView_Previews: PreviewProvider {
Group {
CopyableView(title: "secret_detail_sha256_fingerprint_label", image: Image(systemName: "figure.wave"), text: "Hello world.")
.padding()
CopyableView(title: "secret_detail_sha256_fingerprint_label", image: Image(systemName: "figure.wave"), text: "Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text.")
CopyableView(title: "secret_detail_sha256_fingerprint_label", image: Image(systemName: "figure.wave"), text: "Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. ")
.padding()
}
}

5
Sources/Secretive/Views/ToolbarButtonStyle.swift
View File

@ -31,8 +31,7 @@ struct ToolbarButtonStyle: ButtonStyle {
configuration
.label
.foregroundColor(.white)
.padding(.vertical, 6)
.padding(.horizontal, 9)
.padding(EdgeInsets(top: 6, leading: 8, bottom: 6, trailing: 8))
.glassEffect(.regular.tint(glassTint), in: .capsule)
.onHover { hovering in
self.hovering = hovering
@ -42,8 +41,6 @@ struct ToolbarButtonStyle: ButtonStyle {
.label
.background(colorScheme == .light ? lightColor : darkColor)
.foregroundColor(.white)
.padding(.vertical, 6)
.padding(.horizontal, 8)
.clipShape(RoundedRectangle(cornerRadius: 5))
.overlay(
RoundedRectangle(cornerRadius: 5)