Add focus timer, scheduled blocking, website categories, and redesigned dashboard

- Focus Timer: timed focus sessions (25/45/60/90 min) with strict mode
- Scheduled Blocking: recurring schedules by weekday and time range
- Website Categories: block entire site categories (Social Media, Shopping, News, Entertainment, Gaming)
- Redesigned dashboard with card-based layout replacing old tab interface
- Three monitoring triggers: manual, timer-based, and schedule-based
- New reusable components (StatusCard, QuickConfigCard, TimerRingView, LetterAvatar, WeekdayPicker)
- Updated README for v1.1.0

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: devsemih

README.md

@@ -1,6 +1,6 @@
 # AppJail — Block Distracting Apps & Browser Tabs on macOS
 
-A free, open-source macOS menu bar app that blocks distracting applications and browser tabs to help you stay focused. No background polling, no network requests, no browser extensions required.
+A free, open-source macOS menu bar app that blocks distracting applications and browser tabs to help you stay focused. Focus timer, scheduled blocking, website categories, and more — no browser extensions required.
 
 AppJail sits in your menu bar and enforces focus by terminating blocked applications and closing browser tabs that match URL keywords — all powered by native macOS APIs.
 
@@ -18,13 +18,17 @@ AppJail sits in your menu bar and enforces focus by terminating blocked applicat
 
 ## Features
 
-- **Block Apps** — Toggle any installed application to blocked. When activated, the app is immediately terminated.
+- **Block Apps** — Select any installed application to block. When activated, the app is immediately terminated.
 - **Block Browser Tabs** — Add URL keywords (e.g. `youtube`, `reddit`, `twitter`). Matching tabs are closed automatically — no browser extension needed.
+- **Website Categories** — Block entire categories of sites (Social Media, Shopping, News, Entertainment, Gaming) with one tap instead of adding keywords one by one.
+- **Focus Timer** — Start timed focus sessions (25, 45, 60, or 90 minutes) that automatically enable blocking. Strict mode prevents you from stopping early.
+- **Scheduled Blocking** — Set up recurring block schedules by day of week and time range. Blocking activates and deactivates automatically.
+- **Redesigned Dashboard** — A unified card-based interface replaces the old tab layout. Quick-access cards show blocked app, website, and category counts at a glance.
 - **Menu Bar Only** — Runs entirely from the menu bar with no dock icon. Minimal, distraction-free interface.
 - **Event-Driven** — Monitors app switches via `NSWorkspace` notifications. No polling, no CPU waste.
 - **Privacy-First** — No network requests, no telemetry, no tracking. Everything runs locally on your Mac.
 - **Violation Alerts** — A floating panel appears briefly when a blocked app or URL is caught.
-- **Persistent Block Lists** — Your block lists survive app restarts (stored in UserDefaults).
+- **Persistent Configuration** — All block lists, schedules, and settings survive app restarts.
 
 ## Supported Browsers
 
@@ -84,11 +88,22 @@ Unlike browser extensions or network-level blockers, AppJail blocks both apps an
 ## Architecture
 
 ```
-Models/         Data models and persistence (BlockList, AppInfo)
-Services/       Core logic (MonitoringEngine, AppScanner, BrowserRegistry, AppleScript)
-Views/          SwiftUI views (Dashboard, Apps tab, Browsers tab, Onboarding)
+Models/         Data models and persistence (BlockList, BlockSchedule, FocusTimerState, WebsiteCategory)
+Services/       Core logic (MonitoringEngine, FocusTimerManager, ScheduleManager, AppScanner, BrowserRegistry)
+Views/
+  Components/   Reusable UI components (StatusCard, QuickConfigCard, TimerRingView, etc.)
+  Sheets/       Modal sheets (SelectApps, SelectWebsites, WebsiteCategories, FocusTimer, Schedule)
 ```
 
+## What's New in v1.1.0
+
+- Focus Timer with strict mode and preset durations
+- Scheduled blocking with weekday and time range support
+- Website category blocking (Social Media, Shopping, News, Entertainment, Gaming)
+- Redesigned dashboard with card-based layout and glass effect styling
+- Three monitoring triggers: manual, timer-based, and schedule-based
+- New reusable components (TimerRingView, StatusCard, QuickConfigCard, LetterAvatar)
+
 ## License
 
 MIT

appjail/ContentView.swift

@@ -4,6 +4,8 @@ import Combine
 class BlockList: ObservableObject {
     private static let blockedAppsKey = "blockedAppBundleIDs"
     private static let urlKeywordsKey = "urlKeywords"
+    private static let enabledCategoryIDsKey = "enabledCategoryIDs"
+    private static let schedulesKey = "schedules"
 
     @Published var blockedAppBundleIDs: Set<String> {
         didSet { save() }
@@ -13,10 +15,39 @@ class BlockList: ObservableObject {
         didSet { save() }
     }
 
+    @Published var enabledCategoryIDs: Set<String> {
+        didSet { save() }
+    }
+
+    @Published var schedules: [BlockSchedule] {
+        didSet { save() }
+    }
+
+    var effectiveKeywords: [String] {
+        var combined = Set(urlKeywords)
+        for category in WebsiteCategory.predefined where enabledCategoryIDs.contains(category.id) {
+            combined.formUnion(category.keywords)
+        }
+        return Array(combined)
+    }
+
     init() {
         let savedApps = UserDefaults.standard.stringArray(forKey: Self.blockedAppsKey) ?? []
         self.blockedAppBundleIDs = Set(savedApps)
         self.urlKeywords = UserDefaults.standard.stringArray(forKey: Self.urlKeywordsKey) ?? []
+
+        if let catData = UserDefaults.standard.stringArray(forKey: Self.enabledCategoryIDsKey) {
+            self.enabledCategoryIDs = Set(catData)
+        } else {
+            self.enabledCategoryIDs = []
+        }
+
+        if let scheduleData = UserDefaults.standard.data(forKey: Self.schedulesKey),
+           let decoded = try? JSONDecoder().decode([BlockSchedule].self, from: scheduleData) {
+            self.schedules = decoded
+        } else {
+            self.schedules = []
+        }
     }
 
     func isBlocked(_ bundleID: String) -> Bool {
@@ -43,11 +74,37 @@ class BlockList: ObservableObject {
 
     func urlMatchesKeywords(_ url: String) -> String? {
         let lower = url.lowercased()
-        return urlKeywords.first { lower.contains($0) }
+        return effectiveKeywords.first { lower.contains($0) }
+    }
+
+    func toggleCategory(_ categoryID: String) {
+        if enabledCategoryIDs.contains(categoryID) {
+            enabledCategoryIDs.remove(categoryID)
+        } else {
+            enabledCategoryIDs.insert(categoryID)
+        }
+    }
+
+    func addSchedule(_ schedule: BlockSchedule) {
+        schedules.append(schedule)
+    }
+
+    func removeSchedule(_ id: UUID) {
+        schedules.removeAll { $0.id == id }
+    }
+
+    func updateSchedule(_ schedule: BlockSchedule) {
+        if let index = schedules.firstIndex(where: { $0.id == schedule.id }) {
+            schedules[index] = schedule
+        }
     }
 
     private func save() {
         UserDefaults.standard.set(Array(blockedAppBundleIDs), forKey: Self.blockedAppsKey)
         UserDefaults.standard.set(urlKeywords, forKey: Self.urlKeywordsKey)
+        UserDefaults.standard.set(Array(enabledCategoryIDs), forKey: Self.enabledCategoryIDsKey)
+        if let scheduleData = try? JSONEncoder().encode(schedules) {
+            UserDefaults.standard.set(scheduleData, forKey: Self.schedulesKey)
+        }
     }
 }

appjail/Models/BlockList.swift

@@ -0,0 +1,31 @@
+import Foundation
+
+struct BlockSchedule: Codable, Identifiable {
+    var id: UUID = UUID()
+    var name: String
+    var startTime: DateComponents
+    var endTime: DateComponents
+    var weekdays: Set<Int>
+    var isEnabled: Bool = true
+
+    func isActiveNow() -> Bool {
+        guard isEnabled else { return false }
+        let calendar = Calendar.current
+        let now = Date()
+        let currentWeekday = calendar.component(.weekday, from: now)
+        guard weekdays.contains(currentWeekday) else { return false }
+
+        let currentHour = calendar.component(.hour, from: now)
+        let currentMinute = calendar.component(.minute, from: now)
+        let currentTotal = currentHour * 60 + currentMinute
+
+        let startTotal = (startTime.hour ?? 0) * 60 + (startTime.minute ?? 0)
+        let endTotal = (endTime.hour ?? 0) * 60 + (endTime.minute ?? 0)
+
+        if startTotal <= endTotal {
+            return currentTotal >= startTotal && currentTotal < endTotal
+        } else {
+            return currentTotal >= startTotal || currentTotal < endTotal
+        }
+    }
+}

appjail/Models/BlockSchedule.swift

@@ -0,0 +1,13 @@
+import Foundation
+
+struct FocusTimerState: Codable {
+    enum Status: String, Codable {
+        case idle, running, paused
+    }
+
+    var durationSeconds: Int = 0
+    var remainingSeconds: Int = 0
+    var status: Status = .idle
+    var startedAt: Date?
+    var strictMode: Bool = false
+}

appjail/Models/FocusTimerState.swift

@@ -0,0 +1,47 @@
+import Foundation
+
+struct WebsiteCategory: Identifiable {
+    let id: String
+    let name: String
+    let systemImage: String
+    let keywords: [String]
+    var isEnabled: Bool
+
+    static let predefined: [WebsiteCategory] = [
+        WebsiteCategory(
+            id: "social_media",
+            name: "Social Media",
+            systemImage: "bubble.left.and.bubble.right.fill",
+            keywords: ["facebook.com", "twitter.com", "x.com", "instagram.com", "tiktok.com", "snapchat.com", "reddit.com", "linkedin.com"],
+            isEnabled: false
+        ),
+        WebsiteCategory(
+            id: "shopping",
+            name: "Shopping",
+            systemImage: "cart.fill",
+            keywords: ["amazon.com", "ebay.com", "etsy.com", "walmart.com", "target.com", "aliexpress.com", "shopify.com", "wish.com"],
+            isEnabled: false
+        ),
+        WebsiteCategory(
+            id: "news",
+            name: "News",
+            systemImage: "newspaper.fill",
+            keywords: ["cnn.com", "bbc.com", "foxnews.com", "nytimes.com", "reuters.com", "theguardian.com", "huffpost.com", "news.google.com"],
+            isEnabled: false
+        ),
+        WebsiteCategory(
+            id: "entertainment",
+            name: "Entertainment",
+            systemImage: "film.fill",
+            keywords: ["youtube.com", "netflix.com", "hulu.com", "twitch.tv", "disneyplus.com", "spotify.com", "soundcloud.com", "dailymotion.com"],
+            isEnabled: false
+        ),
+        WebsiteCategory(
+            id: "gaming",
+            name: "Gaming",
+            systemImage: "gamecontroller.fill",
+            keywords: ["steampowered.com", "epicgames.com", "roblox.com", "miniclip.com", "itch.io", "kongregate.com", "poki.com", "coolmathgames.com"],
+            isEnabled: false
+        ),
+    ]
+}

appjail/Models/WebsiteCategory.swift

@@ -0,0 +1,104 @@
+import Foundation
+import Combine
+import UserNotifications
+
+class FocusTimerManager: ObservableObject {
+    @Published var state = FocusTimerState()
+
+    private var timer: Timer?
+
+    var progress: Double {
+        guard state.durationSeconds > 0 else { return 0 }
+        return 1.0 - Double(state.remainingSeconds) / Double(state.durationSeconds)
+    }
+
+    var formattedRemaining: String {
+        let minutes = state.remainingSeconds / 60
+        let seconds = state.remainingSeconds % 60
+        return String(format: "%02d:%02d", minutes, seconds)
+    }
+
+    var isRunning: Bool { state.status == .running }
+    var isPaused: Bool { state.status == .paused }
+    var isIdle: Bool { state.status == .idle }
+
+    func setDuration(minutes: Int) {
+        let seconds = minutes * 60
+        state.durationSeconds = seconds
+        state.remainingSeconds = seconds
+    }
+
+    func start() {
+        guard state.durationSeconds > 0 else { return }
+        state.status = .running
+        state.startedAt = Date()
+        state.remainingSeconds = state.durationSeconds
+        startTimer()
+    }
+
+    func pause() {
+        guard state.status == .running else { return }
+        state.status = .paused
+        stopTimer()
+    }
+
+    func resume() {
+        guard state.status == .paused else { return }
+        state.status = .running
+        state.startedAt = Date().addingTimeInterval(-Double(state.durationSeconds - state.remainingSeconds))
+        startTimer()
+    }
+
+    func stop() {
+        state.status = .idle
+        state.remainingSeconds = state.durationSeconds
+        state.startedAt = nil
+        stopTimer()
+    }
+
+    private func startTimer() {
+        stopTimer()
+        timer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { [weak self] _ in
+            self?.tick()
+        }
+    }
+
+    private func stopTimer() {
+        timer?.invalidate()
+        timer = nil
+    }
+
+    private func tick() {
+        guard state.status == .running, let startedAt = state.startedAt else { return }
+
+        let elapsed = Int(Date().timeIntervalSince(startedAt))
+        let remaining = max(0, state.durationSeconds - elapsed)
+        state.remainingSeconds = remaining
+
+        if remaining <= 0 {
+            complete()
+        }
+    }
+
+    private func complete() {
+        state.status = .idle
+        state.remainingSeconds = 0
+        stopTimer()
+        sendCompletionNotification()
+        NotificationCenter.default.post(name: .focusTimerCompleted, object: nil)
+    }
+
+    private func sendCompletionNotification() {
+        let content = UNMutableNotificationContent()
+        content.title = "Focus Session Complete"
+        content.body = "Great work! Your focus session has ended."
+        content.sound = .default
+
+        let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
+        UNUserNotificationCenter.current().add(request)
+    }
+}
+
+extension Notification.Name {
+    static let focusTimerCompleted = Notification.Name("focusTimerCompleted")
+}