Skip to content

Free, open-source macOS cleaner. CleanMyMac alternative with zero telemetry. Native SwiftUI, scheduled auto-cleaning, Xcode/Homebrew/system cache cleanup. MIT licensed.

fix #127 theme-toggle stray highlight; localize Polish name; bump 2.8.4

momenbasel7100ce1c4eec
diff --git a/PureMac/Views/Components/AppearancePill.swift b/PureMac/Views/Components/AppearancePill.swift
index 907462e..aa36bf5 100644
--- a/PureMac/Views/Components/AppearancePill.swift
+++ b/PureMac/Views/Components/AppearancePill.swift
@@ -5,11 +5,19 @@ import SwiftUI
/// looked like a generic dropdown affordance.
struct AppearancePill: View {
@Binding var selection: AppearanceMode
- @Namespace private var indicator
@Environment(\.accessibilityReduceMotion) private var reduceMotion
+ @Environment(\.layoutDirection) private var layoutDirection
+
+ private static let segmentWidth: CGFloat = 28
+ private static let segmentHeight: CGFloat = 22
+ private static let segmentSpacing: CGFloat = 2
+
+ private var selectedIndex: CGFloat {
+ CGFloat(AppearanceMode.allCases.firstIndex(of: selection) ?? 0)
+ }
var body: some View {
- HStack(spacing: 2) {
+ HStack(spacing: Self.segmentSpacing) {
ForEach(AppearanceMode.allCases) { mode in
Button {
withAnimation(reduceMotion ? nil : .spring(response: 0.32, dampingFraction: 0.78)) {
@@ -18,22 +26,25 @@ struct AppearancePill: View {
} label: {
Image(systemName: mode.icon)
.font(.system(size: 12, weight: .semibold))
- .frame(width: 28, height: 22)
+ .frame(width: Self.segmentWidth, height: Self.segmentHeight)
.foregroundStyle(selection == mode ? Color.primary : .secondary)
- .background(
- ZStack {
- if selection == mode {
- RoundedRectangle(cornerRadius: 6, style: .continuous)
- .fill(Color.primary.opacity(0.10))
- .matchedGeometryEffect(id: "indicator", in: indicator)
- }
- }
- )
.contentShape(Rectangle())
}
.buttonStyle(.plain)
.help(LocalizedStringKey(mode.label))
}
}
+ // Indicator is anchored to the pill's own bounds and positioned by
+ // segment index, so toolbar re-layout can't misplace it. The previous
+ // matchedGeometryEffect resolved a zero frame inside the NSToolbar
+ // hosting view and drew the highlight at the window origin (#127).
+ // .offset(x:) is not layout-direction aware, so mirror it for RTL.
+ .background(alignment: .leading) {
+ let x = selectedIndex * (Self.segmentWidth + Self.segmentSpacing)
+ RoundedRectangle(cornerRadius: 6, style: .continuous)
+ .fill(Color.primary.opacity(0.10))
+ .frame(width: Self.segmentWidth, height: Self.segmentHeight)
+ .offset(x: layoutDirection == .rightToLeft ? -x : x)
+ }
}
}
diff --git a/PureMac/ar.lproj/Localizable.strings b/PureMac/ar.lproj/Localizable.strings
index e95b8fa..06f82d8 100644
--- a/PureMac/ar.lproj/Localizable.strings
+++ b/PureMac/ar.lproj/Localizable.strings
@@ -183,7 +183,7 @@
"Spanish" = "الإسبانية";
"Japanese" = "اليابانية";
"Arabic" = "العربية";
-"Polish" = "Polish";
+"Polish" = "البولندية";
"Portuguese (Brazil)" = "البرتغالية (البرازيل)";
"Chinese (Simplified)" = "الصينية (المبسطة)";
"Chinese (Traditional)" = "الصينية (التقليدية)";
diff --git a/PureMac/es.lproj/Localizable.strings b/PureMac/es.lproj/Localizable.strings
index c56af71..38d9171 100644
--- a/PureMac/es.lproj/Localizable.strings
+++ b/PureMac/es.lproj/Localizable.strings
@@ -183,7 +183,7 @@
"Spanish" = "Español";
"Japanese" = "Japonés";
"Arabic" = "Árabe";
-"Polish" = "Polish";
+"Polish" = "Polaco";
"Portuguese (Brazil)" = "Portugués (Brasil)";
"Chinese (Simplified)" = "Chino (simplificado)";
"Chinese (Traditional)" = "Chino (tradicional)";
diff --git a/PureMac/ja.lproj/Localizable.strings b/PureMac/ja.lproj/Localizable.strings
index e4443cf..9540321 100644
--- a/PureMac/ja.lproj/Localizable.strings
+++ b/PureMac/ja.lproj/Localizable.strings
@@ -183,7 +183,7 @@
"Spanish" = "スペイン語";
"Japanese" = "日本語";
"Arabic" = "アラビア語";
-"Polish" = "Polish";
+"Polish" = "ポーランド語";
"Portuguese (Brazil)" = "ポルトガル語(ブラジル)";
"Chinese (Simplified)" = "中国語(簡体字)";
"Chinese (Traditional)" = "中国語(繁体字)";
diff --git a/PureMac/pl.lproj/Localizable.strings b/PureMac/pl.lproj/Localizable.strings
index d54c685..7c4d716 100644
--- a/PureMac/pl.lproj/Localizable.strings
+++ b/PureMac/pl.lproj/Localizable.strings
@@ -60,7 +60,7 @@
"Dismiss" = "Zamknij";
/* Dashboard */
-"Storage" = "Pamięć";
+"Storage" = "Pamięć masowa";
"Smart Scan" = "Inteligentne skanowanie";
"free of %@" = "wolne z %@";
"%lld%% used" = "%lld%% użyte";
@@ -194,7 +194,7 @@
"Trash" = "Kosz";
"Mail Data" = "Dane poczty";
"Safari Data" = "Dane Safari";
-"Desktop" = "Pulpit";
+"Desktop" = "Biurko";
"Documents" = "Dokumenty";
"TCC Database" = "Baza TCC";
"Blocked" = "Zablokowane";
@@ -354,7 +354,7 @@
/* v2.8.2: large-file folder exclusions (#121) */
"Excluded Folders" = "Wykluczone foldery";
-"Files inside these folders are skipped from the Large & Old Files scan (Downloads, Documents, Desktop)." = "Pliki w tych folderach są pomijane podczas skanowania Dużych i starych plików (Pobrane, Dokumenty, Pulpit).";
+"Files inside these folders are skipped from the Large & Old Files scan (Downloads, Documents, Desktop)." = "Pliki w tych folderach są pomijane podczas skanowania Dużych i starych plików (Pobrane, Dokumenty, Biurko).";
"Remove from exclusions" = "Usuń z wykluczeń";
"Add Folder…" = "Dodaj folder…";
diff --git a/PureMac/pt-BR.lproj/Localizable.strings b/PureMac/pt-BR.lproj/Localizable.strings
index 7bbc29b..d8f4f6d 100644
--- a/PureMac/pt-BR.lproj/Localizable.strings
+++ b/PureMac/pt-BR.lproj/Localizable.strings
@@ -183,7 +183,7 @@
"Spanish" = "Espanhol";
"Japanese" = "Japonês";
"Arabic" = "Árabe";
-"Polish" = "Polish";
+"Polish" = "Polonês";
"Portuguese (Brazil)" = "Português (Brasil)";
"Chinese (Simplified)" = "Chinês (simplificado)";
"Chinese (Traditional)" = "Chinês (tradicional)";
diff --git a/PureMac/zh-Hans.lproj/Localizable.strings b/PureMac/zh-Hans.lproj/Localizable.strings
index 8dd7d49..4e8fbd5 100644
--- a/PureMac/zh-Hans.lproj/Localizable.strings
+++ b/PureMac/zh-Hans.lproj/Localizable.strings
@@ -183,7 +183,7 @@
"Spanish" = "西班牙语";
"Japanese" = "日语";
"Arabic" = "阿拉伯语";
-"Polish" = "Polish";
+"Polish" = "波兰语";
"Portuguese (Brazil)" = "葡萄牙语(巴西)";
"Chinese (Simplified)" = "简体中文";
"Chinese (Traditional)" = "繁体中文";
diff --git a/PureMac/zh-Hant.lproj/Localizable.strings b/PureMac/zh-Hant.lproj/Localizable.strings
index a752cf8..f50b81e 100644
--- a/PureMac/zh-Hant.lproj/Localizable.strings
+++ b/PureMac/zh-Hant.lproj/Localizable.strings
@@ -183,7 +183,7 @@
"Spanish" = "西班牙文";
"Japanese" = "日文";
"Arabic" = "阿拉伯文";
-"Polish" = "Polish";
+"Polish" = "波蘭文";
"Portuguese (Brazil)" = "葡萄牙文(巴西)";
"Chinese (Simplified)" = "簡體中文";
"Chinese (Traditional)" = "繁體中文";
diff --git a/project.yml b/project.yml
index f598a9a..88c8108 100644
--- a/project.yml
+++ b/project.yml
@@ -23,8 +23,8 @@ settings:
CODE_SIGN_ENTITLEMENTS: "PureMac/PureMac.entitlements"
INFOPLIST_FILE: "PureMac/Info.plist"
PRODUCT_BUNDLE_IDENTIFIER: "com.puremac.app"
- MARKETING_VERSION: "2.8.3"
- CURRENT_PROJECT_VERSION: "18"
+ MARKETING_VERSION: "2.8.4"
+ CURRENT_PROJECT_VERSION: "19"
GENERATE_INFOPLIST_FILE: "NO"
ASSETCATALOG_COMPILER_APPICON_NAME: "AppIcon"
COMBINE_HIDPI_IMAGES: "YES"