git.stevedylan.dev

chore: refactored contentview fad3aaec

Steve · 2025-12-25 13:34 3 file(s) · +255 −164

Titan/Components/IndeterminateProgressBar.swift (added) +32 −0

1	+	//
2	+	// IndeterminateProgressBar.swift
3	+	// Titan
4	+	//
5	+
6	+	import SwiftUI
7	+
8	+	struct IndeterminateProgressBar: View {
9	+	let color: Color
10	+
11	+	@State private var animationOffset: CGFloat = -1.0
12	+
13	+	var body: some View {
14	+	GeometryReader { geometry in
15	+	Rectangle()
16	+	.fill(color)
17	+	.frame(width: geometry.size.width * 0.3)
18	+	.offset(x: animationOffset * geometry.size.width)
19	+	}
20	+	.frame(height: 3)
21	+	.clipped()
22	+	.onAppear {
23	+	withAnimation(.easeInOut(duration: 0.8).repeatForever(autoreverses: true)) {
24	+	animationOffset = 1.0
25	+	}
26	+	}
27	+	}
28	+	}
29	+
30	+	#Preview {
31	+	IndeterminateProgressBar(color: .blue)
32	+	}

Titan/Views/BrowserToolbar.swift (added) +193 −0

1	+	//
2	+	// BrowserToolbar.swift
3	+	// Titan
4	+	//
5	+
6	+	import SwiftUI
7	+
8	+	struct BrowserToolbar: View {
9	+	@EnvironmentObject private var themeSettings: ThemeSettings
10	+
11	+	// State bindings
12	+	@Binding var urlText: String
13	+	var isURLFocused: FocusState<Bool>.Binding
14	+	let isLoading: Bool
15	+	let canGoBack: Bool
16	+	let canGoForward: Bool
17	+	let tabCount: Int
18	+	let isBookmarked: Bool
19	+	let canCloseTab: Bool
20	+
21	+	// Callbacks
22	+	let onBack: () -> Void
23	+	let onForward: () -> Void
24	+	let onSubmitURL: () -> Void
25	+	let onDismissKeyboard: () -> Void
26	+	let onShowTabs: () -> Void
27	+	let onNewTab: () -> Void
28	+	let onCloseTab: () -> Void
29	+	let onShowSettings: () -> Void
30	+	let onShowBookmarks: () -> Void
31	+	let onAddBookmark: () -> Void
32	+	let onShowHistory: () -> Void
33	+	let onGoHome: () -> Void
34	+
35	+	var body: some View {
36	+	VStack(spacing: 0) {
37	+	if isLoading {
38	+	IndeterminateProgressBar(color: themeSettings.progressBarColor)
39	+	} else {
40	+	Color.clear
41	+	.frame(height: 3)
42	+	}
43	+
44	+	GlassEffectContainer {
45	+	HStack(spacing: 12) {
46	+	// Navigation buttons in a single pill
47	+	if !isURLFocused.wrappedValue {
48	+	navigationButtons
49	+	}
50	+
51	+	urlTextField
52	+
53	+	if isURLFocused.wrappedValue {
54	+	dismissButton
55	+	} else {
56	+	menuButton
57	+	}
58	+	}
59	+	.animation(.easeInOut(duration: 0.25), value: isURLFocused.wrappedValue)
60	+	}
61	+	.padding(.top, 8)
62	+	}
63	+	.padding(.horizontal, 20)
64	+	.padding(.bottom, 8)
65	+	}
66	+
67	+	// MARK: - Subviews
68	+
69	+	private var navigationButtons: some View {
70	+	HStack(spacing: 0) {
71	+	Button(action: onBack) {
72	+	Image(systemName: "chevron.left")
73	+	.font(.title2)
74	+	.foregroundStyle(canGoBack && !isLoading ? themeSettings.toolbarButtonColor : themeSettings.toolbarButtonColor.opacity(0.3))
75	+	.frame(width: 44, height: 44)
76	+	}
77	+	.disabled(!canGoBack \|\| isLoading)
78	+
79	+	Divider()
80	+	.frame(height: 24)
81	+
82	+	Button(action: onForward) {
83	+	Image(systemName: "chevron.right")
84	+	.font(.title2)
85	+	.foregroundStyle(canGoForward && !isLoading ? themeSettings.toolbarButtonColor : themeSettings.toolbarButtonColor.opacity(0.3))
86	+	.frame(width: 44, height: 44)
87	+	}
88	+	.disabled(!canGoForward \|\| isLoading)
89	+	}
90	+	.glassEffect(.regular.interactive())
91	+	.transition(.opacity.combined(with: .scale(scale: 0.8)))
92	+	}
93	+
94	+	private var urlTextField: some View {
95	+	TextField("Enter Gemini URL", text: $urlText)
96	+	.focused(isURLFocused)
97	+	.autocapitalization(.none)
98	+	.disableAutocorrection(true)
99	+	.keyboardType(.URL)
100	+	.submitLabel(.go)
101	+	.onSubmit {
102	+	isURLFocused.wrappedValue = false
103	+	onSubmitURL()
104	+	}
105	+	.padding(.horizontal, 12)
106	+	.padding(.vertical, 12)
107	+	.glassEffect(.regular, in: .capsule)
108	+	}
109	+
110	+	private var dismissButton: some View {
111	+	Button {
112	+	isURLFocused.wrappedValue = false
113	+	} label: {
114	+	Image(systemName: "xmark.circle.fill")
115	+	.font(.title2)
116	+	.foregroundStyle(themeSettings.toolbarButtonColor)
117	+	.frame(width: 44, height: 44)
118	+	}
119	+	.glassEffect(.regular.interactive())
120	+	.transition(.opacity.combined(with: .scale(scale: 0.8)))
121	+	}
122	+
123	+	private var menuButton: some View {
124	+	Menu {
125	+	Button {
126	+	onShowTabs()
127	+	} label: {
128	+	Label("Tabs (\(tabCount))", systemImage: "square.on.square")
129	+	}
130	+
131	+	Button {
132	+	onNewTab()
133	+	} label: {
134	+	Label("New Tab", systemImage: "plus")
135	+	}
136	+
137	+	Button {
138	+	onCloseTab()
139	+	} label: {
140	+	Label("Close Tab", systemImage: "xmark")
141	+	}
142	+	.disabled(!canCloseTab)
143	+
144	+	Divider()
145	+
146	+	Button {
147	+	onShowSettings()
148	+	} label: {
149	+	Label("Settings", systemImage: "gear")
150	+	}
151	+
152	+	Divider()
153	+
154	+	Button {
155	+	onShowBookmarks()
156	+	} label: {
157	+	Label("Bookmarks", systemImage: "book")
158	+	}
159	+
160	+	Button {
161	+	onAddBookmark()
162	+	} label: {
163	+	if isBookmarked {
164	+	Label("Bookmarked", systemImage: "bookmark.fill")
165	+	} else {
166	+	Label("Add Bookmark", systemImage: "bookmark")
167	+	}
168	+	}
169	+	.disabled(urlText.isEmpty \|\| isBookmarked)
170	+
171	+	Button {
172	+	onShowHistory()
173	+	} label: {
174	+	Label("History", systemImage: "clock")
175	+	}
176	+
177	+	Divider()
178	+
179	+	Button {
180	+	onGoHome()
181	+	} label: {
182	+	Label("Home", systemImage: "house")
183	+	}
184	+	} label: {
185	+	Image(systemName: "ellipsis.circle")
186	+	.font(.title2)
187	+	.foregroundStyle(themeSettings.toolbarButtonColor)
188	+	.frame(width: 44, height: 44)
189	+	}
190	+	.glassEffect(.regular.interactive())
191	+	.transition(.opacity.combined(with: .scale(scale: 0.8)))
192	+	}
193	+	}

Titan/Views/ContentView.swift +30 −164


import SwiftUI

struct IndeterminateProgressBar: View {
    let color: Color

    @State private var animationOffset: CGFloat = -1.0

    var body: some View {
        GeometryReader { geometry in
            Rectangle()
                .fill(color)
                .frame(width: geometry.size.width * 0.3)
                .offset(x: animationOffset * geometry.size.width)
        }
        .frame(height: 3)
        .clipped()
        .onAppear {
            withAnimation(.easeInOut(duration: 0.8).repeatForever(autoreverses: true)) {
                animationOffset = 1.0
            }
        }
    }
}

struct ContentView: View {
    @EnvironmentObject private var themeSettings: ThemeSettings
    @State private var urlText = ""

            }
            .contentMargins(.top, 20, for: .scrollContent)
            .safeAreaInset(edge: .bottom) {
                VStack(spacing: 0) {
                    if isLoading {
                        IndeterminateProgressBar(color: themeSettings.progressBarColor)
                    } else {
                        Color.clear
                            .frame(height: 3)
                    }

                    GlassEffectContainer {
                        HStack(spacing: 12) {
                            // Navigation buttons in a single pill
                            if !isURLFocused {
                                HStack(spacing: 0) {
                                    Button(action: goBack) {
                                        Image(systemName: "chevron.left")
                                            .font(.title2)
                                            .foregroundStyle(canGoBack && !isLoading ? themeSettings.toolbarButtonColor : themeSettings.toolbarButtonColor.opacity(0.3))
                                            .frame(width: 44, height: 44)
                                    }
                                    .disabled(!canGoBack || isLoading)

                                    Divider()
                                        .frame(height: 24)

                                    Button(action: goForward) {
                                        Image(systemName: "chevron.right")
                                            .font(.title2)
                                            .foregroundStyle(canGoForward && !isLoading ? themeSettings.toolbarButtonColor : themeSettings.toolbarButtonColor.opacity(0.3))
                                            .frame(width: 44, height: 44)
                                    }
                                    .disabled(!canGoForward || isLoading)
                                }
                                .glassEffect(.regular.interactive())
                                .transition(.opacity.combined(with: .scale(scale: 0.8)))
                            }

                            TextField("Enter Gemini URL", text: $urlText)
                                .focused($isURLFocused)
                                .autocapitalization(.none)
                                .disableAutocorrection(true)
                                .keyboardType(.URL)
                                .submitLabel(.go)
                                .onSubmit {
                                    isURLFocused = false
                                    navigateTo(urlText)
                                }
                                .padding(.horizontal, 12)
                                .padding(.vertical, 12)
                                .glassEffect(.regular, in: .capsule)

                            if isURLFocused {
                                Button {
                                    isURLFocused = false
                                } label: {
                                    Image(systemName: "xmark.circle.fill")
                                        .font(.title2)
                                        .foregroundStyle(themeSettings.toolbarButtonColor)
                                        .frame(width: 44, height: 44)
                                }
                                .glassEffect(.regular.interactive())
                                .transition(.opacity.combined(with: .scale(scale: 0.8)))
                            } else {
                                Menu {
                                    Button {
                                        showTabs = true
                                    } label: {
                                        Label("Tabs (\(tabManager.tabs.count))", systemImage: "square.on.square")
                                    }

                                    Button {
                                        saveCurrentTabState()
                                        tabManager.createTab(url: themeSettings.homePage)
                                        loadActiveTabState()
                                        navigateTo(themeSettings.homePage)
                                    } label: {
                                        Label("New Tab", systemImage: "plus")
                                    }

                                    Button {
                                        tabManager.closeTab(id: tabManager.activeTabId)
                                        loadActiveTabState()
                                    } label: {
                                        Label("Close Tab", systemImage: "xmark")
                                    }
                                    .disabled(tabManager.tabs.count <= 1)

                                    Divider()

                                    Button {
                                        showSettings = true
                                    } label: {
                                        Label("Settings", systemImage: "gear")
                                    }

                                    Divider()

                                    Button {
                                        showBookmarks = true
                                    } label: {
                                        Label("Bookmarks", systemImage: "book")
                                    }

                                    Button {
                                        addCurrentPageToBookmarks()
                                    } label: {
                                        if bookmarkManager.isBookmarked(url: urlText) {
                                            Label("Bookmarked", systemImage: "bookmark.fill")
                                        } else {
                                            Label("Add Bookmark", systemImage: "bookmark")
                                        }
                                    }
                                    .disabled(urlText.isEmpty || bookmarkManager.isBookmarked(url: urlText))

                                    Button {
                                        showHistory = true
                                    } label: {
                                        Label("History", systemImage: "clock")
                                    }

                                    Divider()

                                    Button {
                                        navigateTo(themeSettings.homePage)
                                    } label: {
                                        Label("Home", systemImage: "house")
                                    }
                                } label: {
                                    Image(systemName: "ellipsis.circle")
                                        .font(.title2)
                                        .foregroundStyle(themeSettings.toolbarButtonColor)
                                        .frame(width: 44, height: 44)
                                }
                                .glassEffect(.regular.interactive())
                                .transition(.opacity.combined(with: .scale(scale: 0.8)))
                            }
                        }
                        .animation(.easeInOut(duration: 0.25), value: isURLFocused)
                    }
                    .padding(.top, 8)
                }
                .padding(.horizontal, 20)
                .padding(.bottom, 8)
                BrowserToolbar(
                    urlText: $urlText,
                    isURLFocused: $isURLFocused,
                    isLoading: isLoading,
                    canGoBack: canGoBack,
                    canGoForward: canGoForward,
                    tabCount: tabManager.tabs.count,
                    isBookmarked: bookmarkManager.isBookmarked(url: urlText),
                    canCloseTab: tabManager.tabs.count > 1,
                    onBack: goBack,
                    onForward: goForward,
                    onSubmitURL: { navigateTo(urlText) },
                    onDismissKeyboard: { isURLFocused = false },
                    onShowTabs: { showTabs = true },
                    onNewTab: {
                        saveCurrentTabState()
                        tabManager.createTab(url: themeSettings.homePage)
                        loadActiveTabState()
                        navigateTo(themeSettings.homePage)
                    },
                    onCloseTab: {
                        tabManager.closeTab(id: tabManager.activeTabId)
                        loadActiveTabState()
                    },
                    onShowSettings: { showSettings = true },
                    onShowBookmarks: { showBookmarks = true },
                    onAddBookmark: addCurrentPageToBookmarks,
                    onShowHistory: { showHistory = true },
                    onGoHome: { navigateTo(themeSettings.homePage) }
                )
            }
        }
        .onAppear {