Skip to content

Redesign CleanupView with expanded options and localization #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexTkDev merged 2 commits into from
Jun 27, 2026
Merged

Redesign CleanupView with expanded options and localization #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00eb458
feat: redesign CleanupView with expanded cleanup options and localize…
Jun 27, 2026
7809d77
Please provide the code changes or file descriptions so I can generat…
Jun 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 93 additions & 41 deletions MacOSCleaner/Features/Cleanup/CleanupView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,53 +76,105 @@ public struct CleanupView: View {
private var idleView: some View {
@Bindable var vm = viewModel

VStack(spacing: 32) {
ZStack {
Circle()
.fill(LinearGradient(colors: [.accentColor.opacity(0.1), .clear], startPoint: .top, endPoint: .bottom))
.frame(width: 120, height: 120)
ScrollView {
VStack(spacing: 28) {
// Hero
VStack(spacing: 16) {
Image(systemName: "sparkles")
.font(.system(size: 36, weight: .regular))
.foregroundStyle(.tint)

VStack(spacing: 6) {
Text("cleanup_ready".localized)
.font(.title2)
.fontWeight(.semibold)

Text("cleanup_ready_sub".localized)
.font(.subheadline)
.foregroundColor(.secondary)
.multilineTextAlignment(.center)
.frame(maxWidth: 340)
}
}
.padding(.top, 40)

Image(systemName: "sparkles")
.font(.system(size: 64, weight: .light))
.foregroundStyle(Color.accentColor)
}
.padding(.bottom, 8)

VStack(spacing: 12) {
Text("cleanup_ready".localized)
.font(.system(.title, design: .rounded, weight: .bold))
// Options card
VStack(alignment: .leading, spacing: 16) {
Text("cleanup_additional_options".localized)
.font(.headline)

optionToggle(
title: "cleanup_option_ds_store".localized,
subtitle: "cleanup_option_ds_store_sub".localized,
value: $vm.options.cleanDSStore
)

DisclosureGroup("cleanup_extended_title".localized) {
VStack(alignment: .leading, spacing: 14) {
optionToggle(
title: "cleanup_option_cloud_docs".localized,
subtitle: "cleanup_option_cloud_docs_sub".localized,
value: $vm.options.cleanCloudDocs
)
optionToggle(
title: "cleanup_option_voice_memos".localized,
subtitle: "cleanup_option_voice_memos_sub".localized,
value: $vm.options.cleanVoiceMemos
)
optionToggle(
title: "cleanup_option_garageband_logic".localized,
subtitle: "cleanup_option_garageband_logic_sub".localized,
value: $vm.options.cleanGarageBandLogic
)
optionToggle(
title: "cleanup_option_imovie_final_cut".localized,
subtitle: "cleanup_option_imovie_final_cut_sub".localized,
value: $vm.options.cleanIMovieFinalCut
)
optionToggle(
title: "cleanup_option_sleep_image".localized,
subtitle: "cleanup_option_sleep_image_sub".localized,
value: $vm.options.cleanSleepImage
)
}
.padding(.leading, 4)
.padding(.top, 8)
}
}
.padding()
.background(Color(NSColor.controlBackgroundColor))
.clipShape(RoundedRectangle(cornerRadius: 12))
.overlay(RoundedRectangle(cornerRadius: 12).stroke(Color.secondary.opacity(0.1), lineWidth: 0.5))

Text("cleanup_ready_sub".localized)
.font(.body)
.foregroundColor(.secondary)
.multilineTextAlignment(.center)
.frame(maxWidth: 360)
}

VStack(alignment: .leading, spacing: 12) {
Text("cleanup_additional_options".localized)
.font(.headline)
.padding(.bottom, 4)
// Start button
Button(action: { viewModel.startScan() }) {
Text("cleanup_start_scan".localized)
.font(.headline)
.frame(maxWidth: 280)
.frame(height: 32)
}
.buttonStyle(.borderedProminent)
.controlSize(.large)

Toggle("cleanup_option_ds_store".localized, isOn: $vm.options.cleanDSStore)
Text("cleanup_option_ds_store_sub".localized)
Spacer()
}
.frame(maxWidth: .infinity)
}
}

private func optionToggle(title: String, subtitle: String, value: Binding<Bool>) -> some View {
HStack {
VStack(alignment: .leading, spacing: 2) {
Text(title)
.font(.subheadline)
Text(subtitle)
.font(.caption)
.foregroundColor(.secondary)
.padding(.leading, 20)
}
.padding()
.background(Color(NSColor.controlBackgroundColor))
.cornerRadius(10)
.padding(.horizontal, 40)
.padding(.top, 10)

Button(action: { viewModel.startScan() }) {
Text("cleanup_start_scan".localized)
.font(.headline)
.frame(width: 180, height: 40)
}
.buttonStyle(.borderedProminent)
.controlSize(.large)
Spacer()
Toggle(isOn: value) { EmptyView() }
.toggleStyle(.switch)
.controlSize(.small)
}
}

Expand Down
11 changes: 11 additions & 0 deletions MacOSCleaner/Resources/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,17 @@
"cleanup_option_modcache_sub" = "Removes downloaded Go modules. Re-downloads on next build.";
"cleanup_option_projects" = "Clean .dart_tool in projects";
"cleanup_option_projects_sub" = "Removes Flutter/Dart project caches in ~/Documents, ~/Projects, ~/Developer, ~/dev, ~/code, ~/repos.";
"cleanup_option_cloud_docs" = "Clean iCloud Documents";
"cleanup_option_cloud_docs_sub" = "Removes iCloud document cache. Documents re-download from iCloud on demand.";
"cleanup_option_voice_memos" = "Clean Voice Memos";
"cleanup_option_voice_memos_sub" = "Removes Voice Memos recordings from the library.";
"cleanup_option_garageband_logic" = "Clean GarageBand / Logic";
"cleanup_option_garageband_logic_sub" = "Removes GarageBand and Logic Pro project files and caches.";
"cleanup_option_imovie_final_cut" = "Clean iMovie / Final Cut";
"cleanup_option_imovie_final_cut_sub" = "Removes iMovie and Final Cut Pro render files and libraries.";
"cleanup_option_sleep_image" = "Clean Sleep Image";
"cleanup_option_sleep_image_sub" = "Removes the hibernation image file. macOS recreates it on next sleep.";
"cleanup_extended_title" = "Extended Cleanup";
"cleanup_start_scan" = "Start Scan";
"cleanup_failed" = "Cleanup Failed";
"cleanup_failed_default" = "An error occurred during the cleanup process.";
Expand Down
11 changes: 11 additions & 0 deletions MacOSCleaner/Resources/es.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,17 @@
"cleanup_option_modcache_sub" = "Elimina módulos de Go descargados. Se descargan de nuevo en la próxima compilación.";
"cleanup_option_projects" = "Limpiar .dart_tool en proyectos";
"cleanup_option_projects_sub" = "Elimina cachés de proyectos Flutter/Dart en ~/Documents, ~/Projects, ~/Developer, ~/dev, ~/code, ~/repos.";
"cleanup_option_cloud_docs" = "Limpiar Documentos de iCloud";
"cleanup_option_cloud_docs_sub" = "Elimina el caché de documentos de iCloud. Los documentos se vuelven a descargar de iCloud bajo demanda.";
"cleanup_option_voice_memos" = "Limpiar Notas de Voz";
"cleanup_option_voice_memos_sub" = "Elimina las grabaciones de Notas de Voz de la biblioteca.";
"cleanup_option_garageband_logic" = "Limpiar GarageBand / Logic";
"cleanup_option_garageband_logic_sub" = "Elimina archivos de proyecto y cachés de GarageBand y Logic Pro.";
"cleanup_option_imovie_final_cut" = "Limpiar iMovie / Final Cut";
"cleanup_option_imovie_final_cut_sub" = "Elimina archivos de renderizado y bibliotecas de iMovie y Final Cut Pro.";
"cleanup_option_sleep_image" = "Limpiar Imagen de Suspensión";
"cleanup_option_sleep_image_sub" = "Elimina el archivo de imagen de hibernación. macOS lo recrea en el próximo sueño.";
"cleanup_extended_title" = "Limpieza extendida";
"cleanup_start_scan" = "Iniciar escaneo";
"cleanup_failed" = "Limpieza fallida";
"cleanup_failed_default" = "Ocurrió un error durante el proceso de limpieza.";
Expand Down
11 changes: 11 additions & 0 deletions MacOSCleaner/Resources/ru.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,17 @@
"cleanup_option_modcache_sub" = "Удаляет скачанные модули Go. Повторно скачиваются при следующей сборке.";
"cleanup_option_projects" = "Очистить .dart_tool в проектах";
"cleanup_option_projects_sub" = "Удаляет кэши проектов Flutter/Dart в ~/Documents, ~/Projects, ~/Developer, ~/dev, ~/code, ~/repos.";
"cleanup_option_cloud_docs" = "Очистить iCloud Документы";
"cleanup_option_cloud_docs_sub" = "Удаляет кэш iCloud-документов. Документы заново загружаются из iCloud по запросу.";
"cleanup_option_voice_memos" = "Очистить голосовые заметки";
"cleanup_option_voice_memos_sub" = "Удаляет записи голосовых заметок из библиотеки.";
"cleanup_option_garageband_logic" = "Очистить GarageBand / Logic";
"cleanup_option_garageband_logic_sub" = "Удаляет файлы проектов и кэши GarageBand и Logic Pro.";
"cleanup_option_imovie_final_cut" = "Очистить iMovie / Final Cut";
"cleanup_option_imovie_final_cut_sub" = "Удаляет файлы рендеринга и библиотеки iMovie и Final Cut Pro.";
"cleanup_option_sleep_image" = "Очистить образ сна";
"cleanup_option_sleep_image_sub" = "Удаляет файл гибернации (/var/vm/sleepimage). macOS воссоздаст его при следующем сне.";
"cleanup_extended_title" = "Расширенная очистка";
"cleanup_start_scan" = "Начать сканирование";
"cleanup_failed" = "Ошибка очистки";
"cleanup_failed_default" = "Произошла ошибка в процессе очистки.";
Expand Down
11 changes: 11 additions & 0 deletions MacOSCleaner/Resources/uk.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,17 @@
"cleanup_option_modcache_sub" = "Видаляє завантажені модулі Go. Повторно завантажуються під час наступної збірки.";
"cleanup_option_projects" = "Очистити .dart_tool у проектах";
"cleanup_option_projects_sub" = "Видаляє кеші проектів Flutter/Dart у ~/Documents, ~/Projects, ~/Developer, ~/dev, ~/code, ~/repos.";
"cleanup_option_cloud_docs" = "Очистити iCloud Документи";
"cleanup_option_cloud_docs_sub" = "Видаляє кеш iCloud-документів. Документи заново завантажуються з iCloud за запитом.";
"cleanup_option_voice_memos" = "Очистити голосові нотатки";
"cleanup_option_voice_memos_sub" = "Видаляє записи голосових нотаток з бібліотеки.";
"cleanup_option_garageband_logic" = "Очистити GarageBand / Logic";
"cleanup_option_garageband_logic_sub" = "Видаляє файли проектів та кеші GarageBand і Logic Pro.";
"cleanup_option_imovie_final_cut" = "Очистити iMovie / Final Cut";
"cleanup_option_imovie_final_cut_sub" = "Видаляє файли рендерингу та бібліотеки iMovie і Final Cut Pro.";
"cleanup_option_sleep_image" = "Очистити образ сну";
"cleanup_option_sleep_image_sub" = "Видаляє файл гібернації (/var/vm/sleepimage). macOS відтворить його під час наступного сну.";
"cleanup_extended_title" = "Розширене очищення";
"cleanup_start_scan" = "Почати сканування";
"cleanup_failed" = "Помилка очищення";
"cleanup_failed_default" = "Сталася помилка в процесі очищення.";
Expand Down
Binary file removed assets/screenshots/Cleanup.png
View file
Open in desktop
Binary file not shown.
Binary file added assets/screenshots/Cleanup_page.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading