mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-09-21 03:00:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restore ScrollToTop on timeline tab

Browse source
This commit is contained in:
Thomas Ricouard 2024-09-14 08:09:51 +02:00
parent 594fb3ea07
commit 122e57d8ac
3 changed files with 48 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
IceCubesApp/App/Main/AppView.swift
View file

@ -26,6 +26,7 @@ struct AppView: View {
@State var iosTabs = iOSTabs.shared @State var iosTabs = iOSTabs.shared
@State var sidebarTabs = SidebarTabs.shared @State var sidebarTabs = SidebarTabs.shared
@State var selectedTabScrollToTop: Int = -1
var body: some View { var body: some View {
#if os(visionOS) #if os(visionOS)
@ -75,6 +76,7 @@ struct AppView: View {
} }
.id(appAccountsManager.currentClient.id) .id(appAccountsManager.currentClient.id)
.withSheetDestinations(sheetDestinations: $appRouterPath.presentedSheet) .withSheetDestinations(sheetDestinations: $appRouterPath.presentedSheet)
.environment(\.selectedTabScrollToTop, selectedTabScrollToTop)
} }
private func updateTab(with newTab: AppTab) { private func updateTab(with newTab: AppTab) {
@ -90,6 +92,15 @@ struct AppView: View {
HapticManager.shared.fireHaptic(.tabSelection) HapticManager.shared.fireHaptic(.tabSelection)
SoundEffectManager.shared.playSound(.tabSelection) SoundEffectManager.shared.playSound(.tabSelection)
if selectedTab == newTab {
selectedTabScrollToTop = newTab.rawValue
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
selectedTabScrollToTop = -1
}
} else {
selectedTabScrollToTop = -1
}
selectedTab = newTab selectedTab = newTab
} }

1
Packages/Env/Sources/Env/CustomEnvValues.swift
View file

@ -12,4 +12,5 @@ extension EnvironmentValues {
@Entry public var isStatusFocused: Bool = false @Entry public var isStatusFocused: Bool = false
@Entry public var isHomeTimeline: Bool = false @Entry public var isHomeTimeline: Bool = false
@Entry public var indentationLevel: UInt = 0 @Entry public var indentationLevel: UInt = 0
@Entry public var selectedTabScrollToTop: Int = -1
} }

11
Packages/Timeline/Sources/Timeline/View/TimelineView.swift
View file

@ -11,6 +11,8 @@ import SwiftUIIntrospect
@MainActor @MainActor
public struct TimelineView: View { public struct TimelineView: View {
@Environment(\.scenePhase) private var scenePhase @Environment(\.scenePhase) private var scenePhase
@Environment(\.selectedTabScrollToTop) private var selectedTabScrollToTop
@Environment(Theme.self) private var theme @Environment(Theme.self) private var theme
@Environment(CurrentAccount.self) private var account @Environment(CurrentAccount.self) private var account
@Environment(StreamWatcher.self) private var watcher @Environment(StreamWatcher.self) private var watcher
@ -45,6 +47,7 @@ public struct TimelineView: View {
public var body: some View { public var body: some View {
ZStack(alignment: .top) { ZStack(alignment: .top) {
ScrollViewReader { proxy in
List { List {
scrollToTopView scrollToTopView
TimelineTagGroupheaderView(group: $selectedTagGroup, timeline: $timeline) TimelineTagGroupheaderView(group: $selectedTagGroup, timeline: $timeline)
@ -60,6 +63,13 @@ public struct TimelineView: View {
.id(client.id) .id(client.id)
.environment(\.defaultMinListRowHeight, 1) .environment(\.defaultMinListRowHeight, 1)
.listStyle(.plain) .listStyle(.plain)
.onChange(of: selectedTabScrollToTop) { _, newValue in
if newValue == 0, routerPath.path.isEmpty {
withAnimation {
proxy.scrollTo(ScrollToView.Constants.scrollToTop, anchor: .top)
}
}
}
#if !os(visionOS) #if !os(visionOS)
.scrollContentBackground(.hidden) .scrollContentBackground(.hidden)
.background(theme.primaryBackgroundColor) .background(theme.primaryBackgroundColor)
@ -72,6 +82,7 @@ public struct TimelineView: View {
collectionView.isPrefetchingEnabled = true collectionView.isPrefetchingEnabled = true
collectionView.prefetchDataSource = prefetcher collectionView.prefetchDataSource = prefetcher
} }
}
if viewModel.timeline.supportNewestPagination { if viewModel.timeline.supportNewestPagination {
TimelineUnreadStatusesView(observer: viewModel.pendingStatusesObserver) TimelineUnreadStatusesView(observer: viewModel.pendingStatusesObserver)
} }