ch/ChWebsiteApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve buttons

Browse Source
This commit is contained in:
Christoph Hagen
2025-05-04 20:59:45 +02:00
parent f968ccad29
commit d779b7a42c
6 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHDataManagement.xcodeproj/project.pbxproj
View File

@ -207,7 +207,7 @@
E2F3B3982DC54F9400CFA712 /* ChangeObservingItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F3B3972DC54F8600CFA712 /* ChangeObservingItem.swift */; }; E2F3B3982DC54F9400CFA712 /* ChangeObservingItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F3B3972DC54F8600CFA712 /* ChangeObservingItem.swift */; };
E2F3B39C2DC5542E00CFA712 /* LabelEditingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F3B39B2DC5542E00CFA712 /* LabelEditingView.swift */; }; E2F3B39C2DC5542E00CFA712 /* LabelEditingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F3B39B2DC5542E00CFA712 /* LabelEditingView.swift */; };
E2F3B39E2DC55B1C00CFA712 /* LabelCreationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F3B39D2DC55B1C00CFA712 /* LabelCreationView.swift */; }; E2F3B39E2DC55B1C00CFA712 /* LabelCreationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F3B39D2DC55B1C00CFA712 /* LabelCreationView.swift */; };
E2F3B3A22DC769C300CFA712 /* DeleteButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F3B3A12DC769BF00CFA712 /* DeleteButton.swift */; }; E2F3B3A22DC769C300CFA712 /* ColoredButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F3B3A12DC769BF00CFA712 /* ColoredButton.swift */; };
E2F3B3A42DC7DC2400CFA712 /* GenerationIssuesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F3B3A32DC7DC1F00CFA712 /* GenerationIssuesView.swift */; }; E2F3B3A42DC7DC2400CFA712 /* GenerationIssuesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F3B3A32DC7DC1F00CFA712 /* GenerationIssuesView.swift */; };
E2FD1D0D2D2DBBA600B48627 /* LinkPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2FD1D0C2D2DBBA100B48627 /* LinkPreview.swift */; }; E2FD1D0D2D2DBBA600B48627 /* LinkPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2FD1D0C2D2DBBA100B48627 /* LinkPreview.swift */; };
E2FD1D192D2DC4F500B48627 /* LoadingContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2FD1D182D2DC4F500B48627 /* LoadingContext.swift */; }; E2FD1D192D2DC4F500B48627 /* LoadingContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2FD1D182D2DC4F500B48627 /* LoadingContext.swift */; };
@ -492,7 +492,7 @@
E2F3B3972DC54F8600CFA712 /* ChangeObservingItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangeObservingItem.swift; sourceTree = "<group>"; }; E2F3B3972DC54F8600CFA712 /* ChangeObservingItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangeObservingItem.swift; sourceTree = "<group>"; };
E2F3B39B2DC5542E00CFA712 /* LabelEditingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelEditingView.swift; sourceTree = "<group>"; }; E2F3B39B2DC5542E00CFA712 /* LabelEditingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelEditingView.swift; sourceTree = "<group>"; };
E2F3B39D2DC55B1C00CFA712 /* LabelCreationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelCreationView.swift; sourceTree = "<group>"; }; E2F3B39D2DC55B1C00CFA712 /* LabelCreationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelCreationView.swift; sourceTree = "<group>"; };
E2F3B3A12DC769BF00CFA712 /* DeleteButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeleteButton.swift; sourceTree = "<group>"; }; E2F3B3A12DC769BF00CFA712 /* ColoredButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColoredButton.swift; sourceTree = "<group>"; };
E2F3B3A32DC7DC1F00CFA712 /* GenerationIssuesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenerationIssuesView.swift; sourceTree = "<group>"; }; E2F3B3A32DC7DC1F00CFA712 /* GenerationIssuesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenerationIssuesView.swift; sourceTree = "<group>"; };
E2FD1D0C2D2DBBA100B48627 /* LinkPreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkPreview.swift; sourceTree = "<group>"; }; E2FD1D0C2D2DBBA100B48627 /* LinkPreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkPreview.swift; sourceTree = "<group>"; };
E2FD1D182D2DC4F500B48627 /* LoadingContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingContext.swift; sourceTree = "<group>"; }; E2FD1D182D2DC4F500B48627 /* LoadingContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingContext.swift; sourceTree = "<group>"; };
@ -834,7 +834,7 @@
E2A21C372CB9A4F10060935B /* Generic */ = { E2A21C372CB9A4F10060935B /* Generic */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
E2F3B3A12DC769BF00CFA712 /* DeleteButton.swift */, E2F3B3A12DC769BF00CFA712 /* ColoredButton.swift */,
E229902F2D0F75CF009F8D77 /* BoolPropertyView.swift */, E229902F2D0F75CF009F8D77 /* BoolPropertyView.swift */,
E22990312D0F7678009F8D77 /* DatePropertyView.swift */, E22990312D0F7678009F8D77 /* DatePropertyView.swift */,
E29D312F2D03A2BD0051B7F4 /* DescriptionField.swift */, E29D312F2D03A2BD0051B7F4 /* DescriptionField.swift */,
@ -1455,7 +1455,7 @@
E25DA58B2D020C9500AEF16D /* PageImage.swift in Sources */, E25DA58B2D020C9500AEF16D /* PageImage.swift in Sources */,
E2521DFC2D5020BE00C56662 /* PostContentGenerator.swift in Sources */, E2521DFC2D5020BE00C56662 /* PostContentGenerator.swift in Sources */,
E21850232CF10C850090B18B /* TagSelectionView.swift in Sources */, E21850232CF10C850090B18B /* TagSelectionView.swift in Sources */,
E2F3B3A22DC769C300CFA712 /* DeleteButton.swift in Sources */, E2F3B3A22DC769C300CFA712 /* ColoredButton.swift in Sources */,
E2A21C332CB5BCAC0060935B /* PageContentView.swift in Sources */, E2A21C332CB5BCAC0060935B /* PageContentView.swift in Sources */,
E22990402D0F95EC009F8D77 /* FolderOnDiskPropertyView.swift in Sources */, E22990402D0F95EC009F8D77 /* FolderOnDiskPropertyView.swift in Sources */,
E2FE0F422D2B4821002963B7 /* OtherCodeBlock.swift in Sources */, E2FE0F422D2B4821002963B7 /* OtherCodeBlock.swift in Sources */,

30
CHDataManagement/Views/Files/FileDetailView.swift
View File

@ -51,20 +51,24 @@ struct FileDetailView: View {
text: "A file that can be used in a post or page") text: "A file that can be used in a post or page")
GenericPropertyView(title: "Actions") { GenericPropertyView(title: "Actions") {
HStack(spacing: 10) { ColoredButton(icon: .folder, text: "Show in folder", action: showFileInFinder)
ButtonIcon(.folder, action: showFileInFinder) ColoredButton(icon: .arrowClockwise, text: "Mark file as changed", action: markFileAsChanged)
ButtonIcon(.arrowClockwise, action: markFileAsChanged) if file.isExternallyStored {
if file.isExternallyStored { ColoredButton(
ButtonIcon(.squareAndArrowDown, action: replaceFile) icon: .squareAndArrowDown,
} else { text: "Convert to internal file",
ButtonIcon(.arrowLeftArrowRight, action: replaceFile) action: replaceFile)
ButtonIcon(.squareDashed, action: convertToExternal) } else {
} ColoredButton(
ButtonIcon(.trash, action: deleteFile) icon: .arrowLeftArrowRight,
.foregroundStyle(.red) text: "Replace file",
action: replaceFile)
ColoredButton(
icon: .squareDashed,
text: "Convert to external file",
action: convertToExternal)
} }
.buttonStyle(.plain) ColoredButton(delete: deleteFile)
.foregroundStyle(.blue)
} }
IdPropertyView( IdPropertyView(

20
CHDataManagement/Views/Generic/DeleteButton.swift
View File

@ -1,20 +0,0 @@
import SwiftUI
struct DeleteButton: View {
let action: () -> Void
var body: some View {
Button(action: action) {
HStack {
Spacer()
Image(systemSymbol: .trash)
Text("Delete")
.padding(.vertical, 8)
Spacer()
}
.foregroundStyle(Color.white)
.background(RoundedRectangle(cornerRadius: 8).fill(Color.red))
}.buttonStyle(.plain)
}
}

2
CHDataManagement/Views/Pages/PageDetailView.swift
View File

@ -76,7 +76,7 @@ struct PageDetailView: View {
page: page.localized(in: language), page: page.localized(in: language),
transferImage: transferImage) transferImage: transferImage)
.id(page.id + language.rawValue) .id(page.id + language.rawValue)
DeleteButton(action: deletePage) ColoredButton(delete: deletePage)
} }
.padding() .padding()
} }

10
CHDataManagement/Views/Posts/PostDetailView.swift
View File

@ -1,4 +1,5 @@
import SwiftUI import SwiftUI
import SFSafeSymbols
struct PostDetailView: View { struct PostDetailView: View {
@ -33,7 +34,12 @@ struct PostDetailView: View {
text: "Posts capture quick updates and can link to pages") text: "Posts capture quick updates and can link to pages")
if post.linkedPage == nil { if post.linkedPage == nil {
Button("Create page", action: createPageFromPost) ColoredButton(
icon: .documentBadgePlus,
text: "Create page",
fillColor: .blue,
textColor: .white,
action: createPageFromPost)
} }
IdPropertyView( IdPropertyView(
@ -76,7 +82,7 @@ struct PostDetailView: View {
LocalizedPostDetailView( LocalizedPostDetailView(
post: post.localized(in: language), post: post.localized(in: language),
transferImage: transferImage) transferImage: transferImage)
DeleteButton(action: deletePost) ColoredButton(delete: deletePost)
} }
.padding() .padding()
} }

2
CHDataManagement/Views/Tags/TagDetailView.swift
View File

@ -43,7 +43,7 @@ struct TagDetailView: View {
tag: tag.localized(in: language), tag: tag.localized(in: language),
transferImage: transferImage) transferImage: transferImage)
.id(tag.id + language.rawValue) .id(tag.id + language.rawValue)
DeleteButton(action: deleteTag) ColoredButton(delete: deleteTag)
} }
.padding() .padding()
} }