Add uncategorized layout reset option

Ariver

2026-06-11 2774b3ea8fbcc13dc69bbd2cde9e641eeb105679

 src/Apptag/PreferencesView.swift

@@ -3,8 +3,47 @@

// MARK: - Preferences View

private enum SettingsTab: String, CaseIterable, Identifiable {
    case language
    case general
    case hotkeys
    case tags
    case data
    case about

    var id: String { rawValue }

    var titleKey: String {
        switch self {
        case .language: return "settings.language"
        case .general: return "settings.general"
        case .hotkeys: return "quickSearch.hotkeys"
        case .tags: return "settings.tags"
        case .data: return "settings.data"
        case .about: return "settings.about"
        }
    }

    var systemImage: String {
        switch self {
        case .language: return "globe"
        case .general: return "gearshape"
        case .hotkeys: return "keyboard"
        case .tags: return "tag.fill"
        case .data: return "externaldrive.fill"
        case .about: return "info.circle"
        }
    }
}

private enum InitialLayoutMode: String {
    case uncategorized
    case smart
}

struct PreferencesView: View {
    private let settingsWindowWidth: CGFloat = 1000
    private let settingsWindowHeight: CGFloat = 640
    private let settingsContentWidth: CGFloat = 940
    private let generalContentWidth: CGFloat = 720
    private let generalLabelWidth: CGFloat = 190
@@ -31,10 +70,14 @@
    @State private var tagColors: [String: Int] = [:]
    @State private var categoryScheme = TagDatabase.CategorySchemeState()
    @State private var isApplyingSystemScheme = false
    @State private var isResettingToUncategorized = false
    @State private var showApplySystemSchemeConfirmation = false
    @State private var showResetToUncategorizedConfirmation = false
    @State private var isDataFilePanelPresented = false
    @State private var hotkeyStatusToast: String? = nil
    @State private var hotkeyStatusToastToken: UUID? = nil
    @State private var selectedTab: SettingsTab = .general
    @State private var selectedInitialLayoutMode: InitialLayoutMode = .smart

    private func scanApps() {
        DispatchQueue.global(qos: .userInitiated).async {
@@ -264,6 +307,18 @@
        }
    }

    private func applySelectedInitialLayout() {
        switch selectedInitialLayoutMode {
        case .uncategorized:
            guard !isResettingToUncategorized else { return }
            withAnimation(.easeOut(duration: 0.16)) {
                showResetToUncategorizedConfirmation = true
            }
        case .smart:
            applySystemInitialScheme()
        }
    }

    private func performApplySystemInitialScheme() {
        guard !isApplyingSystemScheme else { return }
        showApplySystemSchemeConfirmation = false
@@ -291,6 +346,29 @@
                        message: tr("settings.systemSchemeApplyFailed")
                    )
                }
            }
        }
    }

    private func performResetToUncategorized() {
        guard !isResettingToUncategorized else { return }
        showResetToUncategorizedConfirmation = false
        TagDatabase.flushPendingCategorySchemeBackupBatch()
        isResettingToUncategorized = true

        DispatchQueue.global(qos: .userInitiated).async {
            let result = AppLibraryController.resetToUncategorized()

            DispatchQueue.main.async {
                isResettingToUncategorized = false
                allApps = result.snapshot.apps
                tagColors = result.snapshot.tagColors
                refreshDataState()
                notifyDataChanged()
                showDataAlert(
                    title: tr("settings.resetToUncategorizedApplied"),
                    message: tr("settings.resetToUncategorizedAppliedMessage")
                )
            }
        }
    }
@@ -348,6 +426,29 @@
                    .frame(width: 16, height: 16)
                Text(title)
                    .font(.system(size: 13, weight: .medium))
            }
            .foregroundStyle(isSelected ? Color.accentColor : Color.primary)
            .contentShape(Rectangle())
        }
        .buttonStyle(.plain)
    }

    private func initialLayoutOption(
        _ title: String,
        mode: InitialLayoutMode
    ) -> some View {
        let isSelected = selectedInitialLayoutMode == mode
        return Button {
            selectedInitialLayoutMode = mode
        } label: {
            HStack(spacing: 6) {
                Image(systemName: isSelected ? "largecircle.fill.circle" : "circle")
                    .font(.system(size: 13, weight: .medium))
                    .frame(width: 16, height: 16)
                Text(title)
                    .font(.system(size: 13, weight: .medium))
                    .lineLimit(1)
                    .minimumScaleFactor(0.85)
            }
            .foregroundStyle(isSelected ? Color.accentColor : Color.primary)
            .contentShape(Rectangle())
@@ -493,9 +594,58 @@
        }
    }

    private var settingsTabBar: some View {
        HStack(spacing: 8) {
            ForEach(SettingsTab.allCases) { tab in
                settingsTabButton(tab)
            }
        }
        .frame(height: 96, alignment: .center)
        .frame(maxWidth: .infinity)
        .background(Color(nsColor: .windowBackgroundColor))
    }

    private func settingsTabButton(_ tab: SettingsTab) -> some View {
        let isSelected = selectedTab == tab
        return Button {
            selectedTab = tab
        } label: {
            VStack(spacing: 5) {
                Image(systemName: tab.systemImage)
                    .font(.system(size: 25, weight: .regular))
                    .symbolRenderingMode(.hierarchical)
                    .frame(width: 32, height: 32)
                Text(tr(tab.titleKey))
                    .font(.system(size: 13, weight: .semibold))
                    .lineLimit(2)
                    .multilineTextAlignment(.center)
                    .minimumScaleFactor(0.8)
            }
            .foregroundStyle(isSelected ? Color.accentColor : Color.secondary)
            .frame(width: 108, height: 74)
            .background(
                RoundedRectangle(cornerRadius: 8, style: .continuous)
                    .fill(isSelected ? Color.accentColor.opacity(0.10) : Color.clear)
            )
            .overlay(
                RoundedRectangle(cornerRadius: 8, style: .continuous)
                    .stroke(isSelected ? Color.accentColor.opacity(0.20) : Color.clear, lineWidth: 1)
            )
            .contentShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
        }
        .buttonStyle(.plain)
        .accessibilityLabel(tr(tab.titleKey))
        .accessibilityIdentifier("settings-tab-\(tab.rawValue)")
    }

    var body: some View {
        ZStack {
            TabView {
            VStack(spacing: 0) {
                settingsTabBar
                Divider()
                Group {
                    switch selectedTab {
                    case .language:
                // Tab 1: Language
                VStack(alignment: .leading, spacing: 10) {
                    Text(tr("settings.language"))
@@ -558,9 +708,9 @@
                    .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
                }
                .frame(maxWidth: settingsContentWidth, alignment: .leading)
                .tabItem { Label(tr("settings.language"), systemImage: "globe") }
                .padding()

                    case .general:
                // Tab 2: General
                ScrollView(.vertical, showsIndicators: true) {
                    VStack(alignment: .leading, spacing: 0) {
@@ -648,8 +798,8 @@
                    .frame(maxWidth: generalContentWidth, alignment: .center)
                    .padding()
                }
                .tabItem { Label(tr("settings.general"), systemImage: "gearshape") }

                    case .hotkeys:
            // Tab 3: Hotkeys
            ScrollView(.vertical, showsIndicators: true) {
                VStack(alignment: .leading, spacing: 16) {
@@ -659,8 +809,8 @@
                .frame(maxWidth: generalContentWidth, alignment: .center)
                .padding()
            }
            .tabItem { Label(tr("quickSearch.hotkeys"), systemImage: "keyboard") }

                    case .tags:
            // Tab 4: Tags
            VStack(spacing: 0) {
                TagEditorView(
@@ -669,9 +819,9 @@
                    onRefresh: { scanApps() }
                )
            }
            .tabItem { Label(tr("settings.tags"), systemImage: "tag.fill") }
            .onAppear { scanApps() }

                    case .data:
            // Tab 5: Data
            VStack(spacing: 0) {
                Spacer(minLength: 32)
@@ -679,7 +829,7 @@
                VStack(alignment: .center, spacing: 0) {
                    VStack(alignment: .leading, spacing: 12) {
                        HStack(alignment: .center, spacing: 12) {
                            Text(tr("settings.systemScheme"))
                            Text(tr("settings.initialLayout"))
                                .font(.system(size: 13, weight: .semibold))
                                .foregroundStyle(.secondary)
                                .lineLimit(1)
@@ -687,19 +837,24 @@
                                .multilineTextAlignment(.trailing)
                                .frame(width: dataLabelWidth, alignment: .trailing)

                            Text(SmartStartService.systemInitialSchemeName)
                                .font(.system(size: 13, weight: .medium))
                                .foregroundStyle(.primary)
                                .lineLimit(1)
                                .truncationMode(.middle)
                            HStack(spacing: 22) {
                                initialLayoutOption(
                                    tr("settings.initialLayoutUncategorized"),
                                    mode: .uncategorized
                                )
                                initialLayoutOption(
                                    tr("settings.initialLayoutSmart"),
                                    mode: .smart
                                )
                            }
                                .frame(maxWidth: .infinity, alignment: .leading)
                                .layoutPriority(0)
                                .layoutPriority(1)

                            dataActionButton(
                                tr("settings.applyScheme"),
                                prominent: true,
                                enabled: !isApplyingSystemScheme,
                                action: applySystemInitialScheme
                                enabled: !isApplyingSystemScheme && !isResettingToUncategorized,
                                action: applySelectedInitialLayout
                            )
                            .frame(width: dataActionWidth, alignment: .trailing)
                            .layoutPriority(2)
@@ -810,10 +965,10 @@

                Spacer(minLength: 18)
            }
            .tabItem { Label(tr("settings.data"), systemImage: "externaldrive.fill") }
            .padding()
            .onAppear { refreshDataState() }

                    case .about:
            // Tab 6: About
            VStack(spacing: 0) {
                Spacer(minLength: 72)
@@ -876,8 +1031,10 @@
                Spacer(minLength: 30)
                Spacer(minLength: 18)
            }
            .tabItem { Label(tr("settings.about"), systemImage: "info.circle") }
            .padding()
                    }
                }
                .frame(maxWidth: .infinity, maxHeight: .infinity)
            }
            .onChange(of: selectedLanguage) { _, code in
                L10n.switchSelection(to: code)
@@ -909,7 +1066,7 @@
            }

            if showApplySystemSchemeConfirmation {
                ApplySystemSchemeConfirmationView(
                SettingsConfirmationView(
                    title: tr("settings.applySystemSchemeWarningTitle"),
                    message: tr("settings.applySystemSchemeWarningMessage"),
                    confirmTitle: tr("settings.confirmApplyScheme"),
@@ -918,6 +1075,23 @@
                    onCancel: {
                        withAnimation(.easeOut(duration: 0.14)) {
                            showApplySystemSchemeConfirmation = false
                        }
                    }
                )
                .zIndex(3)
                .transition(.opacity)
            }

            if showResetToUncategorizedConfirmation {
                SettingsConfirmationView(
                    title: tr("settings.resetToUncategorizedWarningTitle"),
                    message: tr("settings.resetToUncategorizedWarningMessage"),
                    confirmTitle: tr("settings.confirmResetToUncategorized"),
                    cancelTitle: tr("settings.cancel"),
                    onConfirm: performResetToUncategorized,
                    onCancel: {
                        withAnimation(.easeOut(duration: 0.14)) {
                            showResetToUncategorizedConfirmation = false
                        }
                    }
                )
@@ -947,7 +1121,7 @@
                .transition(.opacity.combined(with: .move(edge: .bottom)))
            }
        }
        .frame(width: settingsWindowWidth, height: 480)
        .frame(width: settingsWindowWidth, height: settingsWindowHeight)
        .onAppear {
            syncSelectedLanguage()
            showPendingHotkeyWarningIfNeeded()
@@ -1032,7 +1206,7 @@
    }
}

private struct ApplySystemSchemeConfirmationView: View {
private struct SettingsConfirmationView: View {
    let title: String
    let message: String
    let confirmTitle: String