icons and look and feel

Author: priyanahata

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>uno.anahata</groupId>
     <artifactId>gemini-java-client</artifactId>
-    <version>1.0.13</version>
+    <version>1.0.14-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>gemini-java-client</name>
@@ -412,6 +412,11 @@
                     <artifactId>slf4j-jdk14</artifactId>
                     <version>2.0.17</version>
                 </dependency>
+                <dependency>
+                    <groupId>com.formdev</groupId>
+                    <artifactId>flatlaf-intellij-themes</artifactId>
+                    <version>3.6.2</version>
+                </dependency>
             </dependencies>
         </profile>
 

src/main/java/uno/anahata/ai/swing/ChatPanel.java

@@ -27,6 +27,8 @@
 import uno.anahata.ai.status.StatusListener;
 import uno.anahata.ai.context.provider.ContextProvider;
 import uno.anahata.ai.gemini.GeminiAPI;
+import uno.anahata.ai.swing.SwingChatConfig.ThemeMode;
+import uno.anahata.ai.swing.SwingChatConfig.UITheme;
 
 @Slf4j
 @Getter
@@ -43,6 +45,7 @@ public class ChatPanel extends JPanel implements ContextListener, StatusListener
     private JButton loadSessionButton;
     private JToggleButton localToolsButton;
     private JToggleButton serverToolsButton;
+    private JComboBox<ThemeMode> themeModeComboBox;
     private JComboBox<Model> modelIdComboBox;
 
     private final EditorKitProvider editorKitProvider;
@@ -83,6 +86,9 @@ public ChatPanel(SwingChatConfig config, EditorKitProvider editorKitProvider) {
         this.config = config;
         this.editorKitProvider = editorKitProvider;
 
+        // CRITICAL: Initialize the UITheme with the correct config BEFORE creating any UI components
+        UITheme.refresh(config);
+        
         FunctionPrompter prompter = new SwingFunctionPrompter(this);
         this.chat = new Chat(config, prompter);
         this.chat.addContextListener(this);
@@ -112,7 +118,7 @@ private void initComponents() {
             }
         });
 
-        serverToolsButton = new JToggleButton(IconUtils.getIcon("google.png", 18), chat.isServerToolsEnabled());
+        serverToolsButton = new JToggleButton(IconUtils.getIcon("google.png"), chat.isServerToolsEnabled());
         serverToolsButton.setToolTipText("Enable / Disable Server Tools (Google Search)");
         serverToolsButton.addActionListener(e -> {
             boolean selected = serverToolsButton.isSelected();
@@ -159,8 +165,27 @@ private void initComponents() {
 
         add(toolbar, BorderLayout.WEST);
 
-        // --- NORTH Panel (Model ID only) ---
+        // --- NORTH Panel (Model ID and Theme) ---
         JPanel northPanel = new JPanel(new BorderLayout());
+        
+        // Theme Selector (Moved to the LEFT)
+        themeModeComboBox = new JComboBox<>(ThemeMode.values());
+        themeModeComboBox.setSelectedItem(config.getThemeMode());
+        themeModeComboBox.addActionListener(e -> {
+            ThemeMode selected = (ThemeMode) themeModeComboBox.getSelectedItem();
+            if (selected != null) {
+                config.setThemeMode(selected);
+                UITheme.refresh(config);
+                chatPanel.redraw();
+                heatmapPanel.updateContext(chat.getContext()); // Refresh heatmap colors
+            }
+        });
+        
+        JPanel themePanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        themePanel.add(new JLabel("Theme:"));
+        themePanel.add(themeModeComboBox);
+        northPanel.add(themePanel, BorderLayout.WEST);
+        
         modelIdComboBox = new JComboBox<>();
         modelIdComboBox.setRenderer(new DefaultListCellRenderer() {
             @Override
@@ -189,10 +214,11 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
             }
         });
 
-        JPanel modelIdPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
-        modelIdPanel.add(new JLabel("Model:"));
-        modelIdPanel.add(modelIdComboBox);
-        northPanel.add(modelIdPanel, BorderLayout.EAST);
+        JPanel modelPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+        modelPanel.add(new JLabel("Model:"));
+        modelPanel.add(modelIdComboBox);
+        northPanel.add(modelPanel, BorderLayout.EAST);
+        
         add(northPanel, BorderLayout.NORTH);
 
         // --- SOUTH Panel (Input and Status) ---
@@ -202,7 +228,6 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
         JPanel mainSouthPanel = new JPanel(new BorderLayout());
         mainSouthPanel.add(inputPanel, BorderLayout.CENTER);
         mainSouthPanel.add(statusPanel, BorderLayout.SOUTH);
-        // We will add this to the split pane later, not directly to the main panel.
 
         // --- CENTER Panel (Tabs) ---
         chatPanel = new ConversationPanel(this);
@@ -239,7 +264,6 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
         mainSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, tabbedPane, mainSouthPanel);
         mainSplitPane.setResizeWeight(0.8); // Give more space to the chat history initially
         mainSplitPane.setOneTouchExpandable(true);
-        // By removing the setBorder call, we restore the default L&F border, making the divider visible.
 
         add(mainSplitPane, BorderLayout.CENTER);
 
@@ -334,24 +358,6 @@ public void checkAutobackupOrStartupContent() {
         boolean restoreAttempted = false;
 
         if (autobackupFile.exists() && autobackupFile.length() > 0) {
-            
-            /*
-            int response = JOptionPane.showConfirmDialog(
-                    this,
-                    "An automatic backup from a previous session was found. \n"
-                            + "\n\n" + autobackupFile + ""
-                            + "\n\nDo you want to restore it?",
-                    
-                    "Anahata AI - Restore Session? " + autobackupFile.getName(),
-                    JOptionPane.YES_NO_OPTION,
-                    JOptionPane.QUESTION_MESSAGE
-            );
-            if (response == JOptionPane.YES_OPTION) {
-                restoreAttempted = true;
-                loadAutobackupInSwingWorker();
-            }*/
-            
-            //trying always load
             restoreAttempted = true;
             loadAutobackupInSwingWorker();
         }
@@ -458,4 +464,4 @@ private void loadSession() {
             JOptionPane.showMessageDialog(this, "Error loading session: " + ex.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
         }
     }
-}
+}

src/main/java/uno/anahata/ai/swing/ContextHeatmapPanel.java

@@ -57,6 +57,8 @@
 import uno.anahata.ai.tools.ToolManager;
 import uno.anahata.ai.internal.GsonUtils;
 import uno.anahata.ai.internal.PartUtils;
+import uno.anahata.ai.swing.SwingChatConfig.UITheme;
+import uno.anahata.ai.swing.render.PartType;
 
 @Slf4j
 public class ContextHeatmapPanel extends JPanel {
@@ -68,7 +70,6 @@ public class ContextHeatmapPanel extends JPanel {
     private JLabel statusLabel;
     private SwingWorker<List<PartInfo>, Void> worker;
     private ToolManager toolManager;
-    private SwingChatConfig.UITheme theme;
 
     private ScrollableTooltipPopup tooltipPopup;
 
@@ -78,7 +79,6 @@ public ContextHeatmapPanel() {
 
     public void setToolManager(ToolManager toolManager) {
         this.toolManager = toolManager;
-        this.theme = new SwingChatConfig.UITheme();
     }
 
     private void initComponents() {
@@ -249,7 +249,7 @@ private List<PartInfo> buildPartInfoList(List<ChatMessage> context) {
             if (msg.getContent() != null && msg.getContent().parts().isPresent()) {
                 List<Part> parts = msg.getContent().parts().get();
                 for (int j = 0; j < parts.size(); j++) {
-                    infos.add(new PartInfo(i, j, msg, parts.get(j), toolManager, theme, statusMap));
+                    infos.add(new PartInfo(i, j, msg, parts.get(j), toolManager, statusMap));
                 }
             }
         }
@@ -262,7 +262,7 @@ public static class PartInfo {
         private final int partIndex;
         private final long messageSeqId;
         private final String role;
-        private final String partType;
+        private final PartType partType;
         private final long sizeInBytes;
         private final String functionName;
         private final String resourceId;
@@ -271,35 +271,30 @@ public static class PartInfo {
         private final String contentSummary;
         private final String fullContentText;
         private final boolean isError;
-        private final Color roleColor;
         private final Part part;
 
-        PartInfo(int msgIdx, int partIdx, ChatMessage msg, Part part, ToolManager fm, SwingChatConfig.UITheme theme, Map<String, ResourceStatus> statusMap) {
+        PartInfo(int msgIdx, int partIdx, ChatMessage msg, Part part, ToolManager fm, Map<String, ResourceStatus> statusMap) {
             this.messageIndex = msgIdx;
             this.partIndex = partIdx;
             this.messageSeqId = msg.getSequentialId();
             this.role = msg.getContent().role().orElse("unknown");
             this.sizeInBytes = PartUtils.calculateSizeInBytes(part);
-            this.roleColor = getRoleColor(theme, this.role);
             this.part = part;
+            this.partType = PartType.from(part);
 
-            String tempPartType = "Unknown";
             String tempFullContent = part.toString();
             String tempFuncName = "";
             String tempResourceId = "";
             ResourceStatus tempResourceStatus = null;
             boolean tempIsError = false;
 
             if (part.text().isPresent()) {
-                tempPartType = "Text";
                 tempFullContent = part.text().get();
             } else if (part.functionCall().isPresent()) {
-                tempPartType = "FunctionCall";
                 tempFuncName = part.functionCall().get().name().orElse("");
                 tempFullContent = "Call: " + tempFuncName + "\nArgs: " + part.functionCall().get().args();
             } else if (part.functionResponse().isPresent()) {
                 FunctionResponse fr = part.functionResponse().get();
-                tempPartType = "FunctionResponse";
                 tempFuncName = fr.name().orElse("");
                 Map<String, Object> respMap = (Map<String, Object>) fr.response().get();
                 tempFullContent = "Response: " + tempFuncName + "\nContent: " + respMap;
@@ -316,11 +311,14 @@ public static class PartInfo {
                     }
                 }
             } else if (part.inlineData().isPresent()) {
-                tempPartType = "Blob";
                 tempFullContent = "MIME Type: " + part.inlineData().get().mimeType().orElse("") + ", Size: " + sizeInBytes + " bytes";
+            } else if (part.codeExecutionResult().isPresent()) {
+                tempFullContent = part.codeExecutionResult().get().output().orElse("");
+                tempIsError = "ERROR".equalsIgnoreCase(part.codeExecutionResult().get().outcome().map(Object::toString).orElse(""));
+            } else if (part.executableCode().isPresent()) {
+                tempFullContent = part.executableCode().get().code().orElse("");
             }
 
-            this.partType = tempPartType;
             this.fullContentText = tempFullContent;
             this.functionName = tempFuncName;
             this.resourceId = tempResourceId;
@@ -338,15 +336,6 @@ private String extractFilename(String path) {
                 return path;
             }
         }
-
-        private Color getRoleColor(SwingChatConfig.UITheme theme, String role) {
-            switch (role) {
-                case "user": return theme.getUserHeaderBg();
-                case "model": return theme.getModelHeaderBg();
-                case "tool": return theme.getToolHeaderBg();
-                default: return theme.getDefaultHeaderBg();
-            }
-        }
     }
 
     private static class PartTableModel extends AbstractTableModel {
@@ -381,7 +370,7 @@ public Object getValueAt(int rowIndex, int columnIndex) {
                 case 0: return info.getMessageIndex();
                 case 1: return info.getPartIndex();
                 case 2: return info.getRole();
-                case 3: return info.getPartType();
+                case 3: return info.getPartType().name();
                 case 4: return info.getSizeInBytes();
                 case 5: return info.getFunctionName();
                 case 6: return info.getResourceIdFilename();
@@ -401,12 +390,13 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
             if (!isSelected) {
                 int modelRow = table.convertRowIndexToModel(row);
                 PartInfo info = tableModel.getPartInfo(modelRow);
+                UITheme theme = UITheme.get();
                 if (info.isError()) {
-                    c.setBackground(theme.getFunctionErrorBg());
-                    c.setForeground(theme.getFunctionErrorFg());
+                    c.setBackground(theme.getErrorBg());
+                    c.setForeground(theme.getErrorFg());
                 } else {
-                    c.setBackground(info.getRoleColor());
-                    c.setForeground(theme.getFontColor());
+                    c.setBackground(theme.getHeatmapRowBg(info.getRole()));
+                    c.setForeground(theme.getHeatmapRowFg(info.getRole()));
                 }
             }
             return c;
@@ -418,15 +408,6 @@ private static class PieChartPanel extends JPanel {
         private final JTable table;
         private final PartTableModel tableModel;
         private static final DecimalFormat PERCENT_FORMAT = new DecimalFormat("#.0%");
-        private static final Map<String, Color> PART_TYPE_COLORS = new HashMap<>();
-
-        static {
-            PART_TYPE_COLORS.put("Text", new Color(0, 120, 215));
-            PART_TYPE_COLORS.put("FunctionCall", new Color(216, 59, 1));
-            PART_TYPE_COLORS.put("FunctionResponse", new Color(0, 153, 188));
-            PART_TYPE_COLORS.put("Blob", new Color(104, 33, 122));
-            PART_TYPE_COLORS.put("Unknown", Color.GRAY);
-        }
 
         public PieChartPanel(JTable table, PartTableModel tableModel) {
             this.table = table;
@@ -497,9 +478,10 @@ private void processData(List<PartInfo> data) {
             }
             List<Slice> newSlices = new ArrayList<>();
             double currentAngle = 0;
+            UITheme theme = UITheme.get();
             for (PartInfo info : data) {
                 double angle = (double) info.getSizeInBytes() / totalSize * 360.0;
-                Color color = PART_TYPE_COLORS.getOrDefault(info.getPartType(), Color.DARK_GRAY);
+                Color color = theme.getPieColor(info.getRole(), info.isError());
                 newSlices.add(new Slice(currentAngle, angle, color, info, (double) info.getSizeInBytes() / totalSize));
                 currentAngle += angle;
             }
@@ -569,7 +551,8 @@ private void drawLabels(Graphics2D g2d, List<LabelInfo> labels, FontMetrics fm)
             adjustLabelPositions(leftLabels, fm);
 
             // Draw all labels and lines
-            g2d.setColor(Color.BLACK);
+            UITheme theme = UITheme.get();
+            g2d.setColor(theme.getFontColor());
             for (LabelInfo label : labels) {
                 g2d.drawLine((int) label.edgePoint.getX(), (int) label.edgePoint.getY(), (int) label.leaderLineEnd.getX(), (int) label.leaderLineEnd.getY());
                 g2d.drawLine((int) label.leaderLineEnd.getX(), (int) label.leaderLineEnd.getY(), (int) label.horizontalLineEnd.getX(), (int) label.horizontalLineEnd.getY());
@@ -598,7 +581,7 @@ public String getToolTipText(MouseEvent e) {
             if (slice != null) {
                 PartInfo info = slice.info;
                 return String.format("<html><b>%s</b> (Msg %d, Part %d)<br>Size: %d bytes (%.2f%%)<br>Type: %s<br>Summary: %s</html>",
-                    info.getRole(), info.getMessageIndex(), info.getPartIndex(), info.getSizeInBytes(), slice.percentage * 100, info.getPartType(), info.getContentSummary());
+                    info.getRole(), info.getMessageIndex(), info.getPartIndex(), info.getSizeInBytes(), slice.percentage * 100, info.getPartType().name(), info.getContentSummary());
             }
             return null;
         }
@@ -622,10 +605,19 @@ private static class LabelInfo {
 
             LabelInfo(Slice slice, double midAngleRad, int diameter, double sliceCenterX, double sliceCenterY) {
                 this.midAngleRad = midAngleRad;
-                this.text = String.format("%s (%s)",
-                    slice.info.getResourceIdFilename().isEmpty() ? slice.info.getPartType() : slice.info.getResourceIdFilename(),
-                    PERCENT_FORMAT.format(slice.percentage)
-                );
+                
+                String gist;
+                if (!slice.info.getResourceIdFilename().isEmpty()) {
+                    gist = slice.info.getResourceIdFilename();
+                } else if (slice.info.getPartType() == PartType.TEXT) {
+                    gist = StringUtils.capitalize(slice.info.getRole());
+                } else if (slice.info.getPartType() == PartType.FUNCTION_CALL || slice.info.getPartType() == PartType.FUNCTION_RESPONSE) {
+                    gist = slice.info.getFunctionName();
+                } else {
+                    gist = slice.info.getPartType().name();
+                }
+                
+                this.text = String.format("%s (%s)", gist, PERCENT_FORMAT.format(slice.percentage));
 
                 double radius = diameter / 2.0;
                 double labelRadius = radius + 15;
@@ -665,4 +657,4 @@ void adjustY(double amount) {
             }
         }
     }
-}
+}

src/main/java/uno/anahata/ai/swing/ConversationPanel.java

@@ -72,6 +72,15 @@ public void componentResized(ComponentEvent e) {
 
         chatScrollPane = new JScrollPane(chatContentPanel);
         chatScrollPane.setBorder(BorderFactory.createEmptyBorder());
+        
+        // Track the "at bottom" state in real-time as the user scrolls.
+        // This prevents jumping to the bottom when interacting with elements (like toggling tool output)
+        // if the user has scrolled up to read previous messages.
+        chatScrollPane.getVerticalScrollBar().addAdjustmentListener(e -> {
+            if (!e.getValueIsAdjusting()) {
+                wasAtBottom = isScrolledToBottom();
+            }
+        });
 
         JButton scrollToBottomButton = new JButton("↓");
         scrollToBottomButton.setToolTipText("Scroll to Bottom");
@@ -91,9 +100,9 @@ public void redraw() {
         chatContentPanel.removeAll();
         List<ChatMessage> currentContext = chat.getContext();
 
+        ContentRenderer renderer = new ContentRenderer(parentPanel);
         for (ChatMessage chatMessage : currentContext) {
             if (chatMessage.getContent() != null) {
-                ContentRenderer renderer = new ContentRenderer(parentPanel);
                 JComponent messageComponent = renderer.render(chatMessage);
 
                 ChatMessageJPanel messageContainer = new ChatMessageJPanel(chatMessage);