Move timeline up when all others are off

golson · golson · commit b30a177645d6 · 2025-12-16T14:45:10.000-05:00
diff --git a/WMFComponents/Sources/WMFComponents/Components/Activity Tab/WMFActivityTabCustomizeView.swift b/WMFComponents/Sources/WMFComponents/Components/Activity Tab/WMFActivityTabCustomizeView.swift
@@ -5,7 +5,6 @@ import WMFData
 public struct WMFActivityTabCustomizeView: View {
     @ObservedObject var appEnvironment = WMFAppEnvironment.current
     @ObservedObject public var viewModel: WMFActivityTabCustomizeViewModel
-    @Environment(\.dismiss) private var dismiss
 
     public init(viewModel: WMFActivityTabCustomizeViewModel) {
         self.viewModel = viewModel
diff --git a/WMFComponents/Sources/WMFComponents/Components/Activity Tab/WMFActivityTabView.swift b/WMFComponents/Sources/WMFComponents/Components/Activity Tab/WMFActivityTabView.swift
@@ -24,7 +24,11 @@ public struct WMFActivityTabView: View {
                 if !viewModel.customizeViewModel.isTimelineOfBehaviorOn, !viewModel.customizeViewModel.isTimeSpentReadingOn, !viewModel.customizeViewModel.isEditingInsightsOn, !viewModel.customizeViewModel.isReadingInsightsOn {
                     customizedEmptyState()
                 } else {
-                    loggedInList(proxy: proxy)
+                    if viewModel.customizeViewModel.isTimeSpentReadingOn || viewModel.customizeViewModel.isReadingInsightsOn || viewModel.customizeViewModel.isEditingInsightsOn {
+                        loggedInList(proxy: proxy)
+                    } else {
+                        loggedInListTimeline(proxy: proxy)
+                    }
                 }
             } else {
                 if viewModel.customizeViewModel.isTimelineOfBehaviorOn {
@@ -58,7 +62,7 @@ public struct WMFActivityTabView: View {
                         .accessibilityElement()
                         .accessibilityLabel("\(viewModel.hoursMinutesRead), \(viewModel.localizedStrings.timeSpentReading)")
                     }
-
+                    
                     if viewModel.customizeViewModel.isReadingInsightsOn {
                         articlesReadModule(proxy: proxy)
                             .padding(.horizontal, 16)
@@ -117,7 +121,7 @@ public struct WMFActivityTabView: View {
                 )
             }
             .listRowSeparator(.hidden)
-
+            
             if viewModel.customizeViewModel.isTimelineOfBehaviorOn {
                 timelineSectionsList()
                     .id("timelineSection")
@@ -131,6 +135,19 @@ public struct WMFActivityTabView: View {
             viewModel.fetchData(fromAppearance: true)
         }
     }
+    
+    private func loggedInListTimeline(proxy: ScrollViewProxy) -> some View {
+        List {
+            timelineSectionsList()
+        }
+        .scrollContentBackground(.hidden)
+        .listStyle(.grouped)
+        .listCustomSectionSpacing(0)
+        .background(Color(uiColor: theme.paperBackground).edgesIgnoringSafeArea(.all))
+        .onAppear {
+            viewModel.fetchData(fromAppearance: true)
+        }
+    }
 
     private func loggedOutList(proxy: ScrollViewProxy) -> some View {
         List {
@@ -164,7 +181,6 @@ public struct WMFActivityTabView: View {
                 viewModel.onTapGlobalEdits?()
             }
         )
-        // .padding(.top, 20)
     }
 
     private func timelineSectionsList() -> some View {
diff --git a/Wikipedia/Code/ActivityTabViewController.swift b/Wikipedia/Code/ActivityTabViewController.swift
@@ -316,10 +316,6 @@ final class WMFActivityTabHostingController: WMFComponentHostingController<WMFAc
         return navController
     }
 
-    @objc private func dismissCustomizeView() {
-        navigationController?.presentedViewController?.dismiss(animated: true)
-    }
-
     var learnMoreAboutActivityURL: URL? {
 
         guard let appLanguage = WMFDataEnvironment.current.primaryAppLanguage else {

Original file line number	Diff line number	Diff line change
`@@ -316,10 +316,6 @@ final class WMFActivityTabHostingController: WMFComponentHostingController<WMFAc`
`316`	`316`	`return navController`
`317`	`317`	`}`
`318`	`318`
`319`		`- @objc private func dismissCustomizeView() {`
`320`		`- navigationController?.presentedViewController?.dismiss(animated: true)`
`321`		`- }`
`322`		`-`
`323`	`319`	`var learnMoreAboutActivityURL: URL? {`
`324`	`320`
`325`	`321`	`guard let appLanguage = WMFDataEnvironment.current.primaryAppLanguage else {`