github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-06 03:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update watch app

Browse source
This commit is contained in:
isaac 2026-05-28 22:07:52 +02:00
parent 0be58ef45a
commit a2548088f6
2 changed files with 18 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Telegram/WatchApp/tgwatch Watch App/Chats/ChatListView.swift
View file

@ -24,27 +24,20 @@ struct ChatListView: View {
}
content(proxy: proxy)
}
// Gradient is .overlay on the chat-list VStack — NOT a sibling
// of NavigationStack. Earlier this lived in an outer ZStack and
// rendered on top of every pushed destination (e.g. MessageListView's
// back chevron + title), since ZStack draws siblings front-to-back
// regardless of which destination is current. Scoping it to the
// root view's overlay restricts it to the chat list itself.
.overlay(alignment: .top) {
LinearGradient(
colors: [.black.opacity(0.8), .black.opacity(0)],
startPoint: .top,
endPoint: .bottom
)
.frame(height: 48)
.allowsHitTesting(false)
.ignoresSafeArea(edges: .top)
}
.navigationDestination(for: ChatRow.self) { row in
MessageListView(row: row)
}
.navigationTitle("")
.navigationTitle("Chats")
.navigationBarTitleDisplayMode(.inline)
// `.toolbar(.visible)` forces the nav-bar container to
// materialize on the chat list. Without it, watchOS-26 skips
// chrome on a NavigationStack root view, leaving only the
// status row (clock top-right). The push to MessageListView
// then has to grow that minimal status row into a full glass
// nav bar with back chevron + title + trailing avatar, which
// glitches mid-reshape. With the bar present here, the push
// only has to morph content, not allocate a new glass surface.
.toolbar(.visible, for: .navigationBar)
// Must live INSIDE the NavigationStack so the modifier's
// .navigationDestination(isPresented:) attaches to it.
.accountSwitcherSheet(presentation: .push, logoutAffordance: .allowed)
@ -99,18 +92,13 @@ struct ChatListView: View {
.listStyle(.plain)
.focused($listFocused)
.onAppear { listFocused = true }
// Hide the empty title bar so the chat list starts directly under the
// system clock. Pill bar is the first List row, so it scrolls with content.
.toolbar(.hidden, for: .navigationBar)
// `.toolbar(.hidden)` hides the bar visuals but watchOS still reserves
// ~30pt of layout. With a pill bar present, pull up by 38 (slot + 8)
// so the pill row sits ~8pt under the clock — the gradient masks any
// overlap, and the negative bottom inset on the pill row tightens the
// gap to the first chat row to ~8pt. Without a pill bar the first row
// IS a chat row, so we stop at -22 (slot - 8) to leave ~8pt of clear
// space below the clock instead of shoving the chat row into the time
// readout.
.padding(.top, store.pills.count > 1 ? -38 : -22)
// Bar is intentionally visible (forced by `.toolbar(.visible, for:
// .navigationBar)` on the body chain). When folder pills are present,
// pull the pill row up by 24pt to tuck it under the bar's bottom edge
// — without that, the natural top-of-list inset leaves an awkward gap
// between the bar and the pill row. Plain chat rows (no pills) sit at
// the natural top.
.padding(.top, store.pills.count > 1 ? -20 : 0)
}
@ViewBuilder

2
Telegram/WatchApp/tgwatch Watch App/Chats/FolderPill.swift
View file

@ -7,7 +7,7 @@ import TDLibKit
/// is summed across all chats whose `positions` include `chatList`.
struct FolderPill: Identifiable, Equatable, Hashable {
static let allChatsId: Int = -1
static let allChatsName = "All chats"
static let allChatsName = "All"
let id: Int
let chatList: ChatList