Merge branch 'feature/compact-suggestion' into develop

Author: intitni

Core/Sources/HostApp/FeatureSettings/SuggestionSettingsView.swift

@@ -19,6 +19,8 @@ struct SuggestionSettingsView: View {
         var suggestionCodeFontSize
         @AppStorage(\.suggestionFeatureProvider)
         var suggestionFeatureProvider
+        @AppStorage(\.suggestionDisplayCompactMode)
+        var suggestionDisplayCompactMode
         init() {}
     }
 
@@ -105,6 +107,10 @@ struct SuggestionSettingsView: View {
             }
 
             Group {
+                Toggle(isOn: $settings.suggestionDisplayCompactMode) {
+                    Text("Hide Buttons")
+                }
+                
                 Toggle(isOn: $settings.hideCommonPrecedingSpacesInSuggestion) {
                     Text("Hide Common Preceding Spaces")
                 }

Core/Sources/SuggestionWidget/SuggestionPanelContent/CodeBlockSuggestionPanel.swift

@@ -5,6 +5,7 @@ struct CodeBlockSuggestionPanel: View {
     @ObservedObject var suggestion: SuggestionProvider
     @Environment(\.colorScheme) var colorScheme
     @AppStorage(\.suggestionCodeFontSize) var fontSize
+    @AppStorage(\.suggestionDisplayCompactMode) var suggestionDisplayCompactMode
 
     struct ToolBar: View {
         @ObservedObject var suggestion: SuggestionProvider
@@ -48,6 +49,37 @@ struct CodeBlockSuggestionPanel: View {
         }
     }
 
+    struct CompactToolBar: View {
+        @ObservedObject var suggestion: SuggestionProvider
+
+        var body: some View {
+            HStack {
+                Button(action: {
+                    suggestion.selectPreviousSuggestion()
+                }) {
+                    Image(systemName: "chevron.left")
+                }.buttonStyle(.plain)
+
+                Text(
+                    "\(suggestion.currentSuggestionIndex + 1) / \(suggestion.suggestionCount)"
+                )
+                .monospacedDigit()
+
+                Button(action: {
+                    suggestion.selectNextSuggestion()
+                }) {
+                    Image(systemName: "chevron.right")
+                }.buttonStyle(.plain)
+
+                Spacer()
+            }
+            .padding(4)
+            .font(.caption)
+            .foregroundColor(.secondary)
+            .background(.regularMaterial)
+        }
+    }
+
     var body: some View {
         VStack(spacing: 0) {
             CustomScrollView {
@@ -62,7 +94,11 @@ struct CodeBlockSuggestionPanel: View {
             }
             .background(Color.contentBackground)
 
-            ToolBar(suggestion: suggestion)
+            if suggestionDisplayCompactMode {
+                CompactToolBar(suggestion: suggestion)
+            } else {
+                ToolBar(suggestion: suggestion)
+            }
         }
         .xcodeStyleFrame()
     }
@@ -126,6 +162,44 @@ struct CodeBlockSuggestionPanel_Bright_Preview: PreviewProvider {
     }
 }
 
+struct CodeBlockSuggestionPanel_CompactToolBar_Preview: PreviewProvider {
+    static let userDefault = {
+        let userDefault = UserDefaults(suiteName: "CodeBlockSuggestionPanel_CompactToolBar_Preview")
+        userDefault?.set(true, for: \.suggestionDisplayCompactMode)
+        return userDefault!
+    }()
+
+    static var previews: some View {
+        CodeBlockSuggestionPanel(suggestion: SuggestionProvider(
+            code: """
+            LazyVGrid(columns: [GridItem(.fixed(30)), GridItem(.flexible())]) {
+            ForEach(0..<viewModel.suggestion.count, id: \\.self) { index in // lkjaskldjalksjdlkasjdlkajslkdjas
+                Text(viewModel.suggestion[index])
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .multilineTextAlignment(.leading)
+            }
+            """,
+            language: "swift",
+            startLineIndex: 8,
+            suggestionCount: 2,
+            currentSuggestionIndex: 0
+        ), suggestionDisplayCompactMode: .init(
+            wrappedValue: true,
+            "suggestionDisplayCompactMode",
+            store: Self.userDefault
+        ))
+        .preferredColorScheme(.light)
+        .frame(width: 450, height: 400)
+        .background {
+            HStack {
+                Color.red
+                Color.green
+                Color.blue
+            }
+        }
+    }
+}
+
 struct CodeBlockSuggestionPanel_Dark_Objc_Preview: PreviewProvider {
     static var previews: some View {
         CodeBlockSuggestionPanel(suggestion: SuggestionProvider(

Tool/Sources/Preferences/Keys.swift

@@ -217,6 +217,10 @@ public extension UserDefaultPreferenceKeys {
     var realtimeSuggestionToggle: PreferenceKey<Bool> {
         .init(defaultValue: true, key: "RealtimeSuggestionToggle")
     }
+    
+    var suggestionDisplayCompactMode: PreferenceKey<Bool> {
+        .init(defaultValue: false, key: "SuggestionDisplayCompactMode")
+    }
 
     var suggestionCodeFontSize: PreferenceKey<Double> {
         .init(defaultValue: 13, key: "SuggestionCodeFontSize")