exituser/Pearcleaner
1
0
Fork 0
mirror of https://github.com/exituser/Pearcleaner.git synced 2026-09-17 02:38:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Exclude "" from localization by replacing with EmptyViews.

Browse Source
This commit is contained in:
Jinyu Meng
2024-10-18 15:32:55 +09:00
parent 2b70c885b1
commit 50ae40804f
10 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pearcleaner/Settings/About.swift
+6 -6
View File
@@ -72,9 +72,9 @@ struct AboutSettingsTab: View {
}
Spacer()
Button(""){
Button {
NSWorkspace.shared.open(URL(string: "https://github.com/alienator88/Pearcleaner/issues/new/choose")!)
}
} label: { EmptyView() }
.buttonStyle(SimpleButtonStyle(icon: "paperplane", help: String(localized: "View")))
}
@@ -92,16 +92,16 @@ struct AboutSettingsTab: View {
Text("View project contributors")
DisclosureGroup("", isExpanded: $disclose, content: {
DisclosureGroup(isExpanded: $disclose) {
ScrollView {
LazyVStack(alignment: .leading, spacing: 0) {
ForEach(sponsors) { sponsor in
HStack() {
Text(sponsor.name)
Spacer()
Button(""){
Button {
NSWorkspace.shared.open(sponsor.url)
}
} label: { EmptyView() }
.buttonStyle(SimpleButtonStyle(icon: "link", help: String(localized: "View")))
.padding(.trailing)
}
@@ -111,7 +111,7 @@ struct AboutSettingsTab: View {
}
.frame(height: 45)
.padding(5)
})
} label: { EmptyView() }
// Button(action: {
// NSWorkspace.shared.open(URL(string: "https://github.com/sponsors/alienator88")!)
Pearcleaner/Settings/Folders.swift
+4 -4
View File
@@ -96,9 +96,9 @@ struct FolderSettingsTab: View {
HStack {
Spacer()
Text("Drop folders above or click to add").opacity(0.5)
Button("") {
Button {
selectFolder()
}
} label: { EmptyView() }
.buttonStyle(SimpleButtonStyle(icon: "plus.circle", help: String(localized: "Add folder"), size: 16, rotate: true))
Spacer()
}
@@ -183,9 +183,9 @@ struct FolderSettingsTab: View {
HStack {
Spacer()
Text("Drop files or folders above or click to add").opacity(0.5)
Button("") {
Button {
selectFilesFoldersZ()
}
} label: { EmptyView() }
.buttonStyle(SimpleButtonStyle(icon: "plus.circle", help: String(localized: "Add file/folder"), size: 16, rotate: true))
Spacer()
}
Pearcleaner/Settings/General.swift
+2 -2
View File
@@ -146,14 +146,14 @@ struct GeneralSettingsTab: View {
}
InfoButton(text: String(localized: "Real size type will show how much actual allocated space the file has on disk.\n\nLogical type shows the binary size. The filesystem can compress and deduplicate sectors on disk, so real size is sometimes smaller(or bigger) than logical size.\n\nFinder size is similar to if you right click > Get Info on a file in Finder, which will show both the logical and real sizes together."))
Spacer()
Picker("", selection: $sizeType) {
Picker(selection: $sizeType) {
Text("Real")
.tag("Real")
Text("Logical")
.tag("Logical")
// Text("Finder")
// .tag("Finder")
}
} label: { EmptyView() }
.buttonStyle(.borderless)
}
Pearcleaner/Settings/Interface.swift
+2 -2
View File
@@ -371,7 +371,7 @@ struct InterfaceSettingsTab: View {
.foregroundStyle(.primary)
}
Spacer()
Picker("", selection: $selectedMenubarIcon) {
Picker(selection: $selectedMenubarIcon) {
ForEach(icons, id: \.self) { icon in
HStack {
Image(systemName: icon)
@@ -381,7 +381,7 @@ struct InterfaceSettingsTab: View {
.tag(icon)
}
}
} label: { EmptyView() }
.frame(width: 60)
.onChange(of: selectedMenubarIcon) { newValue in
MenuBarExtraManager.shared.swapMenuBarIcon(icon: newValue)
Pearcleaner/Settings/SettingsWindow.swift
+2 -2
View File
@@ -68,9 +68,9 @@ struct SettingsView: View {
Text("v\(Bundle.main.version)").foregroundStyle(.secondary)
.padding(.bottom, 4)
Button("") {
Button {
resetUserDefaults()
}
} label: { EmptyView() }
.buttonStyle(ResetSettingsButtonStyle(isResetting: $isResetting, label: String(localized: "Reset Settings"), help: String(localized: "Reset all settings to default")))
.disabled(isResetting)
Pearcleaner/Settings/Update.swift
+6 -6
View File
@@ -35,21 +35,21 @@ struct UpdateSettingsTab: View {
HStack(alignment: .center, spacing: 20) {
Button(""){
Button {
updater.checkForUpdatesForce(showSheet: false)
}
} label: { EmptyView() }
.buttonStyle(SimpleButtonStyle(icon: "arrow.uturn.left.circle", label: String(localized: "Refresh"), help: String(localized: "Refresh updater")))
Button(""){
Button {
updater.resetAnnouncementAlert()
}
} label: { EmptyView() }
.buttonStyle(SimpleButtonStyle(icon: "star", label: String(localized: "Announcement"), help: String(localized: "Show announcements badge again")))
Button(""){
Button {
NSWorkspace.shared.open(URL(string: "https://github.com/alienator88/Pearcleaner/releases")!)
}
} label: { EmptyView() }
.buttonStyle(SimpleButtonStyle(icon: "link", label: String(localized: "Releases"), help: String(localized: "View releases on GitHub")))
}
Pearcleaner/Views/AppSearchView.swift
+11 -11
View File
@@ -92,7 +92,7 @@ struct AppSearchView: View {
.popover(isPresented: $showMenu) {
VStack(alignment: .leading) {
Button("") {
Button {
withAnimation(Animation.easeInOut(duration: animationEnabled ? 0.35 : 0)) {
// Cycle through all enum cases using `CaseIterable`
if let nextSortOption = SortOption(rawValue: selectedSortOption.rawValue + 1) {
@@ -105,17 +105,17 @@ struct AppSearchView: View {
showMenu = false
}
}
}
} label: { EmptyView() }
.buttonStyle(SimpleButtonStyle(icon: "circle.fill", label: "Sorting: \(selectedSortOption.title)", help: "Sort app list alphabetically by name or by size", size: 5))
if mini && !menubarEnabled {
Button("") {
Button {
withAnimation(Animation.easeInOut(duration: animationEnabled ? 0.35 : 0)) {
appState.currentView = .empty
appState.appInfo = AppInfo.empty
showPopover = false
}
}
} label: { EmptyView() }
.buttonStyle(SimpleButtonStyle(icon: "circle.fill", label: "Drop Target", help: "Drop Target", size: 5))
}
@@ -168,11 +168,11 @@ struct AppSearchView: View {
}
} else if search.isEmpty && (!mini || !menubarEnabled) {
Button("") {
Button {
withAnimation(Animation.easeInOut(duration: animationEnabled ? 0.35 : 0)) {
showMenu.toggle()
}
}
} label: { EmptyView() }
.buttonStyle(SimpleButtonStyle(icon: "line.3.horizontal.decrease.circle", help: selectedSortOption.title, size: 16))
.popover(isPresented: $showMenu, arrowEdge: .bottom) {
VStack(alignment: .leading, spacing: 10) {
@@ -183,12 +183,12 @@ struct AppSearchView: View {
}
Divider()
ForEach(SortOption.allCases) { option in
Button("") {
Button {
withAnimation(Animation.easeInOut(duration: animationEnabled ? 0.35 : 0)) {
selectedSortOption = option
showMenu = false
}
}
} label: { EmptyView() }
.buttonStyle(SimpleButtonStyle(icon: selectedSortOption == option ? "circle.inset.filled" : "circle", label: option.title, help: "", size: 5))
@@ -287,9 +287,9 @@ struct SimpleSearchStyle: TextFieldStyle {
Spacer()
if trash && text != "" {
Button("") {
Button {
text = ""
}
} label: { EmptyView() }
.buttonStyle(SimpleButtonStyle(icon: "delete.left.fill", help: String(localized: "Clear text"), size: 14, padding: padding))
}
}
@@ -332,7 +332,7 @@ struct SearchBar: View {
var body: some View {
HStack {
TextField("", text: $search)
TextField(text: $search) { EmptyView() }
.textFieldStyle(SimpleSearchStyle(trash: true, text: $search, darker: darker, glass: glass, padding: padding, sidebar: sidebar))
}
}
Pearcleaner/Views/FilesView.swift
+6 -6
View File
@@ -203,14 +203,14 @@ struct FilesView: View {
// Item selection and sorting toolbar
HStack() {
Toggle("", isOn: Binding(
Toggle(isOn: Binding(
get: { self.appState.selectedItems.count == self.appState.appInfo.fileSize.keys.count },
set: { newValue in
updateOnMain {
self.appState.selectedItems = newValue ? Set(self.appState.appInfo.fileSize.keys) : []
}
}
))
)) { EmptyView() }
.toggleStyle(SimpleCheckboxToggleStyle())
.help("All checkboxes")
@@ -272,9 +272,9 @@ struct FilesView: View {
Spacer()
Button("") {
Button {
selectedSortAlpha.toggle()
}
} label: { EmptyView() }
.buttonStyle(SimpleButtonStyle(icon: "line.3.horizontal.decrease.circle", label: String(localized: selectedSortAlpha ? "Name" : "Size"), help: String(localized: selectedSortAlpha ? "Sorted alphabetically" : "Sorted by size"), size: 16))
}
@@ -483,7 +483,7 @@ struct FileDetailsItem: View {
var body: some View {
HStack(alignment: .center, spacing: 20) {
Toggle("", isOn: Binding(
Toggle(isOn: Binding(
get: { self.appState.selectedItems.contains(self.path) },
set: { isChecked in
if isChecked {
@@ -492,7 +492,7 @@ struct FileDetailsItem: View {
self.appState.selectedItems.remove(self.path)
}
}
))
)) { EmptyView() }
.toggleStyle(SimpleCheckboxToggleStyle())
.disabled(self.path.path.contains(".Trash"))
Pearcleaner/Views/RegularMode.swift
+2 -2
View File
@@ -104,13 +104,13 @@ struct RegularMode: View {
VStack(spacing: 0) {
HStack {
Spacer()
Picker("", selection: $appState.currentPage) {
Picker(selection: $appState.currentPage) {
ForEach(CurrentPage.allCases) { page in
Text(page.title)
.font(.title3)
.tag(page)
}
}
} label: { EmptyView() }
.buttonStyle(.borderless)
.padding(2)
.padding(.vertical, 2)
Pearcleaner/Views/ZombieView.swift
+5 -5
View File
@@ -127,7 +127,7 @@ struct ZombieView: View {
// Item selection and sorting toolbar
HStack {
Toggle("", isOn: Binding(
Toggle(isOn: Binding(
get: {
if searchZ.isEmpty {
// All items are selected if no filter is applied and all items are selected
@@ -158,7 +158,7 @@ struct ZombieView: View {
updateTotalSizes()
}
))
)) { EmptyView() }
.toggleStyle(SimpleCheckboxToggleStyle())
.help("All checkboxes")
@@ -170,10 +170,10 @@ struct ZombieView: View {
Button("") {
Button {
selectedSortAlpha.toggle()
updateMemoizedFiles(for: searchZ, sizeType: sizeType, selectedSortAlpha: selectedSortAlpha, force: true)
}
} label: { EmptyView() }
.buttonStyle(SimpleButtonStyle(icon: "line.3.horizontal.decrease.circle", label: String(localized: selectedSortAlpha ? "Name" : "Size"), help: String(localized: selectedSortAlpha ? "Sorted alphabetically" : "Sorted by size"), size: 16))
@@ -427,7 +427,7 @@ struct ZombieFileDetailsItem: View {
var body: some View {
HStack(alignment: .center, spacing: 20) {
Toggle("", isOn: $isSelected)
Toggle(isOn: $isSelected) { EmptyView() }
.toggleStyle(SimpleCheckboxToggleStyle())
if let appIcon = icon {