Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Give the screenshot name a Save button that becomes Put Back

Țugui Dragoșefcf4baaf1a4
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index b217b737..45d32737 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -187839,6 +187839,218 @@
}
}
}
+ },
+ "Save" : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Uložit"
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Sichern"
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Guardar"
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Enregistrer"
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Salva"
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "保存"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "저장"
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Bewaar"
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Zachowaj"
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Salvar"
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Salvați"
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Сохранить"
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Spara"
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Kaydet"
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Зберегти"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "保存"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "儲存"
+ }
+ }
+ }
+ },
+ "Save the screenshot name" : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Uložit název snímků obrazovky"
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Namen für Bildschirmfotos sichern"
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Guardar el nombre de las capturas de pantalla"
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Enregistrer le nom des captures d’écran"
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Salva il nome degli screenshot"
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "スクリーンショットの名前を保存"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "스크린샷 이름 저장"
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Bewaar de naam van schermafbeeldingen"
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Zachowaj nazwę zrzutów ekranu"
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Salvar o nome das capturas de tela"
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Salvați numele pentru capturi de ecran"
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Сохранить имя для снимков экрана"
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Spara namnet för skärmavbilder"
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ekran resmi adını kaydet"
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Зберегти назву знімків екрана"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "保存截屏名称"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "儲存截圖名稱"
+ }
+ }
+ }
}
},
"version" : "1.0"
diff --git a/Peel/Views/Tweaks/TweakDetailView.swift b/Peel/Views/Tweaks/TweakDetailView.swift
index 264b5be3..e7def185 100644
--- a/Peel/Views/Tweaks/TweakDetailView.swift
+++ b/Peel/Views/Tweaks/TweakDetailView.swift
@@ -154,20 +154,7 @@ struct TweakRow: View {
}
.motion(value: tweaks.isChangedByPeel(tweak))
case .name:
- Group {
- if tweaks.isChangedByPeel(tweak) {
- Button("Put Back") {
- Task { await tweaks.reset(tweak) }
- }
- .buttonStyle(.bordered)
- .controlSize(.small)
- .disabled(state.isManaged)
- .accessibilityLabel(Text("Put back the screenshot name"))
- .transition(.opacity)
- }
- TweakNameField(tweak: tweak, state: state, problem: $nameProblem)
- }
- .motion(value: tweaks.isChangedByPeel(tweak))
+ TweakNameField(tweak: tweak, state: state, problem: $nameProblem)
}
}
}
@@ -178,24 +165,50 @@ private struct TweakNameField: View {
let state: TweakState
@Binding var problem: ScreenshotName.Problem?
@State private var draft: String?
+ @State private var isSaving = false
@FocusState private var isFocused: Bool
var body: some View {
- TextField(text: text, prompt: ScreenshotName.macOSDefault.map { Text(verbatim: $0) }) {
- Text(tweak.words.title)
- }
- .labelsHidden()
- .textFieldStyle(.roundedBorder)
- .frame(width: 160)
- .focused($isFocused)
- .onSubmit(commit)
- .onChange(of: isFocused) { _, focused in
- if !focused { commit() }
+ let putsBack = !isEdited && tweaks.isChangedByPeel(tweak)
+ Group {
+ TextField(text: text, prompt: ScreenshotName.macOSDefault.map { Text(verbatim: $0) }) {
+ Text(tweak.words.title)
+ }
+ .labelsHidden()
+ .textFieldStyle(.roundedBorder)
+ .frame(width: 160)
+ .focused($isFocused)
+ .onSubmit(commit)
+ .onChange(of: isFocused) { _, focused in
+ if !focused { commit() }
+ }
+ .onDisappear(perform: commit)
+ // Both titles take room, so the button keeps the width of the longer one and the field stays put.
+ Button {
+ if putsBack {
+ Task { await tweaks.reset(tweak) }
+ } else {
+ commit()
+ }
+ } label: {
+ ZStack {
+ Text("Save").opacity(putsBack ? 0 : 1)
+ Text("Put Back").opacity(putsBack ? 1 : 0)
+ }
+ }
+ .buttonStyle(.bordered)
+ .controlSize(.small)
+ .disabled(!putsBack && !isEdited)
+ .accessibilityLabel(putsBack ? Text("Put back the screenshot name") : Text("Save the screenshot name"))
+ .motion(value: putsBack)
}
- .onDisappear(perform: commit)
.disabled(state.isManaged)
}
+ private var isEdited: Bool {
+ draft.map { $0.trimmingCharacters(in: .whitespaces) != state.text ?? "" } ?? false
+ }
+
private var text: Binding<String> {
Binding(
get: { draft ?? state.text ?? "" },
@@ -207,7 +220,7 @@ private struct TweakNameField: View {
}
private func commit() {
- guard let draft else { return }
+ guard let draft, !isSaving else { return }
let name = draft.trimmingCharacters(in: .whitespaces)
guard name != state.text ?? "" else {
self.draft = nil
@@ -217,9 +230,11 @@ private struct TweakNameField: View {
problem = found
return
}
+ isSaving = true
Task {
await tweaks.rename(tweak, to: name)
self.draft = nil
+ isSaving = false
}
}
}