commits: show the patch in place; move the profile to a tab !22

merged merged by cmc on 2026-08-28 18:27 UTC · krz/gitbay-ios:commit-diff-and-profile-tab into main

9 files changed, +39 −88

Layout: unified · split

gitbay/ContentView.swift +8 −2

                             .navigationDestinations(client: client)
                     }
                 }
+                Tab("My Profile", systemImage: "person.crop.circle") {
+                    NavigationStack {
+                        ProfileView(client: client, name: account.username,
+                                    title: "My Profile")
+                            .toolbar { AccountMenu() }
+                            .navigationDestinations(client: client)
+                    }
+                }
             }
             .id(account.id) // fresh screens on account switch
         } else {
             WikiPageView(client: client, repo: repo, page: page)
         case .commit(let repo, let sha):
             CommitView(client: client, repo: repo, sha: sha)
-        case .commitDiff(let repo, let sha):
-            CommitDiffView(client: client, repo: repo, sha: sha)
         case .profile(let name):
             ProfileView(client: client, name: name)
         case .account:

gitbay/Views/Dashboard/DashboardView.swift −1

	@@ -52,7 +52,6 @@ struct DashboardView: View {
52	}	52	}
53	.accessibilityIdentifier("dashboard-create-button")	53	.accessibilityIdentifier("dashboard-create-button")
54	}	54	}
55	AccountMenu()
56	}	55	}
57	.sheet(isPresented: $composing) {	56	.sheet(isPresented: $composing) {
58	RepoCreateSheet(	57	RepoCreateSheet(

gitbay/Views/Discovery/ExploreView.swift −1

	@@ -61,7 +61,6 @@ struct ExploreView: View {
61	}	61	}
62	.overlay { LoadStateOverlay(state: list.state) }	62	.overlay { LoadStateOverlay(state: list.state) }
63	.navigationTitle("Explore")	63	.navigationTitle("Explore")
64	.toolbar { AccountMenu() }
65	.task {	64	.task {
66	if list.state.value == nil { await list.reload() }	65	if list.state.value == nil { await list.reload() }
67	}	66	}

gitbay/Views/Discovery/FeedView.swift −1

	@@ -22,7 +22,6 @@ struct FeedView: View {
22	}	22	}
23	.overlay { LoadStateOverlay(state: list.state) }	23	.overlay { LoadStateOverlay(state: list.state) }
24	.navigationTitle("Feed")	24	.navigationTitle("Feed")
25	.toolbar { AccountMenu() }
26	.task {	25	.task {
27	if list.state.value == nil {	26	if list.state.value == nil {
28	await list.reload()	27	await list.reload()

gitbay/Views/Discovery/ProfileView.swift +7 −2

     @State private var model: ProfileViewModel
-    init(client: GitbayClient, name: String) {
+    /// Someone else's profile is titled with their name. Your own is
+    /// reached from a tab and titled to match it.
+    private let title: String?
+    init(client: GitbayClient, name: String, title: String? = nil) {
         _model = State(initialValue: ProfileViewModel(client: client, name: name))
+        self.title = title
     }
     var body: some View {
             }
         }
         .overlay { LoadStateOverlay(state: model.state) }
-        .navigationTitle(model.name)
+        .navigationTitle(title ?? model.name)
         .navigationBarTitleDisplayMode(.inline)
         .task { await model.load() }
         .refreshable { await model.load() }

gitbay/Views/Repos/CommitView.swift +5 −59

	@@ -64,73 +64,19 @@ struct CommitView: View {
64	}	64	}
65		65
66	if let diff = model.diff, !diff.files.isEmpty {	66	if let diff = model.diff, !diff.files.isEmpty {
67	Section("Changes +\(diff.additions) −\(diff.deletions)") {	67	// The patch, in place. The web's commit page is the
68	ForEach(diff.files) { file in	68	// diff — a file header expands its hunks rather than
69	NavigationLink(value: RepoRoute.file(	69	// linking away to the whole file.
70	repo: model.repoPath, path: file.displayPath, ref: commit.sha
71	)) {
72	HStack {
73	Text(file.displayPath)
74	.font(.gbMono(.caption))
75	.lineLimit(1)
76	.truncationMode(.head)
77	Spacer()
78	Text("+\(file.additions)").foregroundStyle(Color.gbOK)
79	Text("−\(file.deletions)").foregroundStyle(Color.gbBad)
80	}
81	.font(.gbSans(.caption2))
82	}
83	}
84	}
85	}
86	}
87	}
88	.overlay { LoadStateOverlay(state: model.state) }
89	.navigationTitle(String(model.sha.prefix(10)))
90	.navigationBarTitleDisplayMode(.inline)
91	.toolbar {
92	ToolbarItem(placement: .topBarTrailing) {
93	if model.diff?.files.isEmpty == false {
94	NavigationLink(value: RepoRoute.commitDiff(
95	repo: model.repoPath, sha: model.sha
96	)) {
97	Image(systemName: "plus.forwardslash.minus")
98	}
99	.accessibilityIdentifier("commit-diff-button")
100	}
101	}
102	}
103	.task { await model.load() }
104	.refreshable { await model.load() }
105	}
106	}
107
108	/// The commit's patch, rendered by the same view the MR diff uses.
109	struct CommitDiffView: View {
110
111	@State private var model: CommitDetailViewModel
112
113	init(client: GitbayClient, repo: String, sha: String) {
114	_model = State(initialValue: CommitDetailViewModel(
115	client: client, repoPath: repo, sha: sha
116	))
117	}
118
119	var body: some View {
120	ZStack {
121	Color.clear
122	if let diff = model.diff, !diff.files.isEmpty {
123	List {
124	ForEach(diff.files) { file in	70	ForEach(diff.files) { file in
125	DiffFileSection(file: file)	71	DiffFileSection(file: file)
126	}	72	}
127	}	73	}
128	.listStyle(.plain)
129	}	74	}
130	}	75	}
131	.overlay { LoadStateOverlay(state: model.state) }	76	.overlay { LoadStateOverlay(state: model.state) }
132	.navigationTitle("Diff")	77	.navigationTitle(String(model.sha.prefix(10)))
133	.navigationBarTitleDisplayMode(.inline)	78	.navigationBarTitleDisplayMode(.inline)
134	.task { await model.load() }	79	.task { await model.load() }
		80	.refreshable { await model.load() }
135	}	81	}
136	}	82	}

gitbay/Views/Repos/RepoListView.swift +2 −5

                 }
                 .accessibilityIdentifier("repo-create-button")
             }
-            AccountMenu()
         }
         .sheet(isPresented: $composing) {
             RepoCreateSheet(
     }
 }
-/// The account switcher and sign-out, on every top-level screen.
+/// The account switcher and sign-out. It lives on the My Profile tab
+/// only: the other tabs are about the instance, not about who you are.
 struct AccountMenu: ToolbarContent {
     @Environment(SessionStore.self) private var session
             Menu {
                 if let current = session.current {
                     Section(current.label) {
-                        NavigationLink(value: RepoRoute.profile(current.username)) {
-                            Label("My Profile", systemImage: "person.crop.circle")
-                        }
                         NavigationLink(value: RepoRoute.account) {
                             Label("Keys & Email", systemImage: "key")
                         }

gitbay/Views/Repos/RepoRoute.swift −1

	@@ -15,7 +15,6 @@ nonisolated enum RepoRoute: Hashable {
15	case wiki(repo: String)	15	case wiki(repo: String)
16	case wikiPage(repo: String, page: String)	16	case wikiPage(repo: String, page: String)
17	case commit(repo: String, sha: String)	17	case commit(repo: String, sha: String)
18	case commitDiff(repo: String, sha: String)
19	case profile(String)	18	case profile(String)
20	case account	19	case account
21	case addAccount	20	case addAccount

gitbayUITests/LiveSmokeUITests.swift +17 −16

         app.navigationBars.buttons.firstMatch.tap()
     }
-    /// Keys, PGP and email live behind the profile menu now, not their
+    /// Keys, PGP and email live behind the account menu, which is on the
-    /// own toolbar button.
+    /// My Profile tab and nowhere else.
     func openAccountScreen(file: StaticString = #filePath, line: UInt = #line) {
+        selectTab("My Profile")
         let menu = app.descendants(matching: .any)
             .matching(identifier: "account-menu").firstMatch
         XCTAssertTrue(menu.waitForExistence(timeout: 15),
         // A bogus verification code is refused, not swallowed.
         let code = app.descendants(matching: .any)
             .matching(identifier: "email-code").firstMatch
-        XCTAssertTrue(code.waitForExistence(timeout: 5))
+        // Email sits below the keys on a List, which does not build rows
+        // it has not shown.
+        XCTAssertTrue(scrollTo(code), "email section not reachable")
         focusAndType(code, "000000")
         let verify = app.descendants(matching: .any)
             .matching(identifier: "email-verify").firstMatch
                       "dashboard + did not open the create sheet")
         app.buttons["Cancel"].firstMatch.tap()
-        // --- identity is one menu: profile and keys together ---
+        // --- identity is its own tab; the account menu rides with it ---
+        selectTab("My Profile")
         let menu = app.descendants(matching: .any)
             .matching(identifier: "account-menu").firstMatch
-        XCTAssertTrue(menu.waitForExistence(timeout: 10))
+        XCTAssertTrue(menu.waitForExistence(timeout: 10),
+                      "account menu missing from My Profile")
         menu.tap()
         XCTAssertTrue(app.buttons["Keys & Email"].firstMatch.waitForExistence(timeout: 5),
                       "keys not in the account menu")
-        let myProfile = app.buttons["My Profile"].firstMatch
+        app.tap() // dismiss the menu; the profile is already on screen
-        XCTAssertTrue(myProfile.exists, "profile not in the account menu")
-        myProfile.tap()
         // --- a profile is a profile: description, links, orgs, graph, repos ---
         XCTAssertTrue(app.staticTexts
         let firstCommit = app.cells.firstMatch
         XCTAssertTrue(firstCommit.waitForExistence(timeout: 20), "history is empty")
         firstCommit.tap()
-        // The commit screen shows its changed files and can open the patch.
+        // The commit screen IS the patch: no navigating away to find it.
-        XCTAssertTrue(app.descendants(matching: .any)
+        // A hunk header (@@) only appears in a rendered diff.
-            .matching(identifier: "commit-diff-button").firstMatch
+        XCTAssertTrue(app.staticTexts
-            .waitForExistence(timeout: 20), "commit did not open")
+            .containing(NSPredicate(format: "label BEGINSWITH '@@'")).firstMatch
-        app.descendants(matching: .any).matching(identifier: "commit-diff-button")
+            .waitForExistence(timeout: 20),
-            .firstMatch.tap()
+            "commit screen did not render the patch inline")
-        XCTAssertTrue(app.cells.firstMatch.waitForExistence(timeout: 20),
-                      "commit diff rendered nothing")
     }
 }