let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(mac): widen settings and keep critter static when paused

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-06 01:37:52 +01:00
parent e863fd78d6
commit 67fe5ed699
1 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
apps/macos/Sources/Clawdis/AppMain.swift
View File

@@ -688,7 +688,8 @@ struct SettingsRootView: View {
.tabItem { Label("About", systemImage: "info.circle") } .tabItem { Label("About", systemImage: "info.circle") }
.tag(SettingsTab.about) .tag(SettingsTab.about)
} }
.padding(12) .padding(.horizontal, 18)
.padding(.vertical, 16)
.frame(width: SettingsTab.windowWidth, height: SettingsTab.windowHeight, alignment: .topLeading) .frame(width: SettingsTab.windowWidth, height: SettingsTab.windowHeight, alignment: .topLeading)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading) .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
.onReceive(NotificationCenter.default.publisher(for: .clawdisSelectSettingsTab)) { note in .onReceive(NotificationCenter.default.publisher(for: .clawdisSelectSettingsTab)) { note in
@@ -727,8 +728,8 @@ struct SettingsRootView: View {
enum SettingsTab: CaseIterable { enum SettingsTab: CaseIterable {
case general, permissions, debug, about case general, permissions, debug, about
static let windowWidth: CGFloat = 410 static let windowWidth: CGFloat = 520
static let windowHeight: CGFloat = 484 static let windowHeight: CGFloat = 520
var title: String { var title: String {
switch self { switch self {
case .general: return "General" case .general: return "General"
@@ -1222,50 +1223,54 @@ struct OnboardingView: View {
@State private var currentPage = 0 @State private var currentPage = 0
@State private var permStatus: [Capability: Bool] = [:] @State private var permStatus: [Capability: Bool] = [:]
@State private var isRequesting = false @State private var isRequesting = false
@State private var installingCLI = false @State private var installingCLI = false
@State private var cliStatus: String? @State private var cliStatus: String?
@State private var copied = false @State private var copied = false
@ObservedObject private var state = AppStateStore.shared @ObservedObject private var state = AppStateStore.shared
private let pageWidth: CGFloat = 640 private var pageCount: Int { 6 }
private let contentHeight: CGFloat = 260 private var buttonTitle: String { currentPage == pageCount - 1 ? "Finish" : "Next" }
private var pageCount: Int { 6 } private let devLinkCommand = "ln -sf $(pwd)/apps/macos/.build/debug/ClawdisCLI /usr/local/bin/clawdis-mac"
private var buttonTitle: String { currentPage == pageCount - 1 ? "Finish" : "Next" }
private let devLinkCommand = "ln -sf $(pwd)/apps/macos/.build/debug/ClawdisCLI /usr/local/bin/clawdis-mac"
var body: some View { var body: some View {
VStack(spacing: 0) { GeometryReader { proxy in
GlowingClawdisIcon(size: 148) let width = proxy.size.width
.padding(.top, 22) let contentHeight = max(proxy.size.height - 300, 240) // leave room for header + nav
.padding(.bottom, 12)
.frame(maxWidth: .infinity, minHeight: 200, maxHeight: 220)
HStack(spacing: 0) { VStack(spacing: 0) {
welcomePage GlowingClawdisIcon(size: 148)
focusPage .padding(.top, 22)
permissionsPage .padding(.bottom, 12)
cliPage .frame(maxWidth: .infinity, minHeight: 200, maxHeight: 220)
launchPage
readyPage HStack(spacing: 0) {
welcomePage(width: width)
focusPage(width: width)
permissionsPage(width: width)
cliPage(width: width)
launchPage(width: width)
readyPage(width: width)
}
.frame(width: width, height: contentHeight, alignment: .top)
.offset(x: CGFloat(-currentPage) * width)
.animation(
.interactiveSpring(response: 0.5, dampingFraction: 0.86, blendDuration: 0.25),
value: currentPage
)
.clipped()
navigationBar(pageWidth: width)
}
.frame(width: width, height: proxy.size.height, alignment: .top)
.background(Color(NSColor.windowBackgroundColor))
} }
.frame(width: pageWidth, height: contentHeight) .frame(width: 640, height: 560)
.offset(x: CGFloat(-currentPage) * pageWidth) .onAppear { currentPage = 0 }
.animation( .task { await refreshPerms() }
.interactiveSpring(response: 0.5, dampingFraction: 0.86, blendDuration: 0.25),
value: currentPage
)
.clipped()
navigationBar
} }
.frame(width: pageWidth, height: 560, alignment: .top)
.background(Color(NSColor.windowBackgroundColor))
.onAppear { currentPage = 0 }
.task { await refreshPerms() }
}
private var welcomePage: some View { private func welcomePage(width: CGFloat) -> some View {
onboardingPage { onboardingPage(width: width) {
Text("Welcome to Clawdis") Text("Welcome to Clawdis")
.font(.largeTitle.weight(.semibold)) .font(.largeTitle.weight(.semibold))
Text("Your macOS menu bar companion for notifications, screenshots, and privileged agent actions.") Text("Your macOS menu bar companion for notifications, screenshots, and privileged agent actions.")
@@ -1283,8 +1288,8 @@ var body: some View {
} }
} }
private var focusPage: some View { private func focusPage(width: CGFloat) -> some View {
onboardingPage { onboardingPage(width: width) {
Text("What Clawdis handles") Text("What Clawdis handles")
.font(.largeTitle.weight(.semibold)) .font(.largeTitle.weight(.semibold))
onboardingCard { onboardingCard {
@@ -1307,8 +1312,8 @@ var body: some View {
} }
} }
private var permissionsPage: some View { private func permissionsPage(width: CGFloat) -> some View {
onboardingPage { onboardingPage(width: width) {
Text("Grant permissions") Text("Grant permissions")
.font(.largeTitle.weight(.semibold)) .font(.largeTitle.weight(.semibold))
Text("Approve these once and the helper CLI reuses the same grants.") Text("Approve these once and the helper CLI reuses the same grants.")
@@ -1338,8 +1343,8 @@ var body: some View {
} }
} }
private var cliPage: some View { private func cliPage(width: CGFloat) -> some View {
onboardingPage { onboardingPage(width: width) {
Text("Install the helper CLI") Text("Install the helper CLI")
.font(.largeTitle.weight(.semibold)) .font(.largeTitle.weight(.semibold))
Text("Link `clawdis-mac` so scripts and the agent can talk to this app.") Text("Link `clawdis-mac` so scripts and the agent can talk to this app.")
@@ -1382,8 +1387,8 @@ var body: some View {
} }
} }
private var launchPage: some View { private func launchPage(width: CGFloat) -> some View {
onboardingPage { onboardingPage(width: width) {
Text("Keep it running") Text("Keep it running")
.font(.largeTitle.weight(.semibold)) .font(.largeTitle.weight(.semibold))
Text("Let Clawdis launch with macOS so permissions and notifications are ready when automations start.") Text("Let Clawdis launch with macOS so permissions and notifications are ready when automations start.")
@@ -1406,8 +1411,8 @@ var body: some View {
} }
} }
private var readyPage: some View { private func readyPage(width: CGFloat) -> some View {
onboardingPage { onboardingPage(width: width) {
Text("All set") Text("All set")
.font(.largeTitle.weight(.semibold)) .font(.largeTitle.weight(.semibold))
onboardingCard { onboardingCard {
@@ -1430,7 +1435,7 @@ var body: some View {
} }
} }
private var navigationBar: some View { private func navigationBar(pageWidth: CGFloat) -> some View {
HStack(spacing: 20) { HStack(spacing: 20) {
ZStack(alignment: .leading) { ZStack(alignment: .leading) {
Button(action: {}, label: { Button(action: {}, label: {
@@ -1481,12 +1486,12 @@ var body: some View {
.frame(height: 60) .frame(height: 60)
} }
private func onboardingPage(@ViewBuilder _ content: () -> some View) -> some View { private func onboardingPage(width: CGFloat, @ViewBuilder _ content: () -> some View) -> some View {
VStack(spacing: 22) { VStack(spacing: 22) {
content() content()
Spacer() Spacer()
} }
.frame(width: pageWidth, alignment: .top) .frame(width: width, alignment: .top)
.padding(.horizontal, 26) .padding(.horizontal, 26)
} }