Cleanup suggestion view and add feature flags to some animations

Author: intitni

Core/Sources/HostApp/DebugView.swift

@@ -2,7 +2,9 @@ import Preferences
 import SwiftUI
 
 final class DebugSettings: ObservableObject {
-    @AppStorage(\.disableLazyVStack) var disableLazyVStack
+    @AppStorage(\.animationACrashSuggestion) var animationACrashSuggestion
+    @AppStorage(\.animationBCrashSuggestion) var animationBCrashSuggestion
+    @AppStorage(\.animationCCrashSuggestion) var animationCCrashSuggestion
     @AppStorage(\.preCacheOnFileOpen) var preCacheOnFileOpen
     @AppStorage(\.useCustomScrollViewWorkaround) var useCustomScrollViewWorkaround
     @AppStorage(\.triggerActionWithAccessibilityAPI) var triggerActionWithAccessibilityAPI
@@ -15,8 +17,14 @@ struct DebugSettingsView: View {
     var body: some View {
         ScrollView {
             Form {
-                Toggle(isOn: $settings.disableLazyVStack) {
-                    Text("Disable LazyVStack")
+                Toggle(isOn: $settings.animationACrashSuggestion) {
+                    Text("Enable Animation A")
+                }
+                Toggle(isOn: $settings.animationBCrashSuggestion) {
+                    Text("Enable Animation B")
+                }
+                Toggle(isOn: $settings.animationCCrashSuggestion) {
+                    Text("Enable Widget Breathing Animation")
                 }
                 Toggle(isOn: $settings.preCacheOnFileOpen) {
                     Text("Cache editor information on file open")

Core/Sources/SuggestionWidget/CustomScrollView/CustomScrollView.swift

@@ -40,7 +40,9 @@ struct CustomScrollView<Content: View>: View {
             .listStyle(.plain)
             .frame(idealHeight: max(10, height))
             .onPreferenceChange(CustomScrollViewHeightPreferenceKey.self) { newHeight in
-                height = newHeight
+                Task { @MainActor in
+                    height = newHeight
+                }
             }
         } else {
             ScrollView {
@@ -49,3 +51,4 @@ struct CustomScrollView<Content: View>: View {
         }
     }
 }
+

Core/Sources/SuggestionWidget/SuggestionPanelView.swift

@@ -1,4 +1,5 @@
 import Environment
+import Preferences
 import SwiftUI
 
 @MainActor
@@ -20,40 +21,35 @@ final class SuggestionPanelViewModel: ObservableObject {
         }
     }
 
-    enum ActiveTab {
-        case suggestion
-    }
-
-    @Published var content: Content? {
-        didSet {
-            requestApplicationPolicyUpdate?(self)
-        }
-    }
-
-    @Published var activeTab: ActiveTab {
-        didSet {
-            requestApplicationPolicyUpdate?(self)
-        }
-    }
-
+    @Published var content: Content?
     @Published var isPanelDisplayed: Bool
     @Published var alignTopToAnchor = false
     @Published var colorScheme: ColorScheme
 
-    var requestApplicationPolicyUpdate: ((SuggestionPanelViewModel) -> Void)?
-
     public init(
         content: Content? = nil,
         isPanelDisplayed: Bool = false,
-        activeTab: ActiveTab = .suggestion,
-        colorScheme: ColorScheme = .dark,
-        requestApplicationPolicyUpdate: ((SuggestionPanelViewModel) -> Void)? = nil
+        colorScheme: ColorScheme = .dark
     ) {
         self.content = content
         self.isPanelDisplayed = isPanelDisplayed
-        self.activeTab = activeTab
         self.colorScheme = colorScheme
-        self.requestApplicationPolicyUpdate = requestApplicationPolicyUpdate
+    }
+}
+
+extension View {
+    @ViewBuilder
+    func animation<V: Equatable>(
+        featureFlag: KeyPath<UserDefaultPreferenceKeys, FeatureFlag>,
+        _ animation: Animation?,
+        value: V
+    ) -> some View {
+        let isOn = UserDefaults.shared.value(for: featureFlag)
+        if isOn {
+            self.animation(animation, value: value)
+        } else {
+            self
+        }
     }
 }
 
@@ -70,21 +66,19 @@ struct SuggestionPanelView: View {
 
             VStack {
                 if let content = viewModel.content {
-                    if case .suggestion = viewModel.activeTab {
-                        ZStack(alignment: .topLeading) {
-                            switch content {
-                            case let .suggestion(suggestion):
-                                CodeBlockSuggestionPanel(suggestion: suggestion)
-                            case let .promptToCode(provider):
-                                PromptToCodePanel(provider: provider)
-                            case let .error(description):
-                                ErrorPanel(viewModel: viewModel, description: description)
-                            }
+                    ZStack(alignment: .topLeading) {
+                        switch content {
+                        case let .suggestion(suggestion):
+                            CodeBlockSuggestionPanel(suggestion: suggestion)
+                        case let .promptToCode(provider):
+                            PromptToCodePanel(provider: provider)
+                        case let .error(description):
+                            ErrorPanel(viewModel: viewModel, description: description)
                         }
-                        .frame(maxWidth: .infinity, maxHeight: Style.panelHeight)
-                        .fixedSize(horizontal: false, vertical: true)
-                        .allowsHitTesting(viewModel.isPanelDisplayed)
                     }
+                    .frame(maxWidth: .infinity, maxHeight: Style.panelHeight)
+                    .fixedSize(horizontal: false, vertical: true)
+                    .allowsHitTesting(viewModel.isPanelDisplayed)
                 }
             }
             .frame(maxWidth: .infinity)
@@ -101,9 +95,16 @@ struct SuggestionPanelView: View {
             guard viewModel.content != nil else { return 0 }
             return 1
         }())
-        .animation(.easeInOut(duration: 0.2), value: viewModel.content?.contentHash)
-        .animation(.easeInOut(duration: 0.2), value: viewModel.activeTab)
-        .animation(.easeInOut(duration: 0.2), value: viewModel.isPanelDisplayed)
+        .animation(
+            featureFlag: \.animationACrashSuggestion,
+            .easeInOut(duration: 0.2),
+            value: viewModel.content?.contentHash
+        )
+        .animation(
+            featureFlag: \.animationBCrashSuggestion,
+            .easeInOut(duration: 0.2),
+            value: viewModel.isPanelDisplayed
+        )
         .frame(maxWidth: Style.panelWidth, maxHeight: Style.panelHeight)
     }
 }
@@ -155,7 +156,6 @@ struct SuggestionPanelView_Both_DisplayingSuggestion_Preview: PreviewProvider {
                 currentSuggestionIndex: 0
             )),
             isPanelDisplayed: true,
-            activeTab: .suggestion,
             colorScheme: .dark
         ))
         .frame(width: 450, height: 200)

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -27,7 +27,7 @@ public final class SuggestionWidgetController: NSObject {
         it.canBecomeKeyChecker = { false }
         return it
     }()
-    
+
     private lazy var widgetWindow = {
         let it = CanBecomeKeyWindow(
             contentRect: .zero,
@@ -262,7 +262,7 @@ public final class SuggestionWidgetController: NSObject {
             }
         }
     }
-    
+
     func orderFront() {
         widgetWindow.orderFrontRegardless()
         tabWindow.orderFrontRegardless()
@@ -324,7 +324,7 @@ public extension SuggestionWidgetController {
             }
         }
     }
-    
+
     func presentDetachedGlobalChat() {
         chatWindowViewModel.chatPanelInASeparateWindow = true
         Task {

Core/Sources/SuggestionWidget/WidgetView.swift

@@ -19,7 +19,7 @@ final class WidgetViewModel: ObservableObject {
         let deadline = date.timeIntervalSince1970 + 20
         isProcessingCounters.append(IsProcessingCounter(expirationDate: deadline))
         isProcessing = true
-        
+
         cleanupIsProcessingCounterTask?.cancel()
         cleanupIsProcessingCounterTask = Task { [weak self] in
             try await Task.sleep(nanoseconds: 20 * 1_000_000_000)
@@ -105,6 +105,7 @@ struct WidgetView: View {
                             .scaleEffect(x: scale, y: scale)
                             .opacity(!empty || viewModel.isProcessing ? 1 : 0)
                             .animation(
+                                featureFlag: \.animationCCrashSuggestion,
                                 .easeInOut(duration: 1).repeatForever(autoreverses: true),
                                 value: processingProgress
                             )
@@ -117,7 +118,11 @@ struct WidgetView: View {
                             .padding(minimumLineWidth / 2)
                             .scaleEffect(x: scale, y: scale)
                             .opacity(!empty || viewModel.isProcessing ? 1 : 0)
-                            .animation(.easeInOut(duration: 1), value: processingProgress)
+                            .animation(
+                                featureFlag: \.animationCCrashSuggestion,
+                                .easeInOut(duration: 1),
+                                value: processingProgress
+                            )
                     }
                 }
             }

Tool/Sources/Preferences/Keys.swift

@@ -326,5 +326,17 @@ public extension UserDefaultPreferenceKeys {
     var triggerActionWithAccessibilityAPI: FeatureFlag {
         .init(defaultValue: true, key: "FeatureFlag-TriggerActionWithAccessibilityAPI")
     }
+    
+    var animationACrashSuggestion: FeatureFlag {
+        .init(defaultValue: true, key: "FeatureFlag-AnimationACrashSuggestion")
+    }
+    
+    var animationBCrashSuggestion: FeatureFlag {
+        .init(defaultValue: true, key: "FeatureFlag-AnimationBCrashSuggestion")
+    }
+    
+    var animationCCrashSuggestion: FeatureFlag {
+        .init(defaultValue: true, key: "FeatureFlag-AnimationCCrashSuggestion")
+    }
 }