diff --git a/src/main/java/com/parafield/storming/Icons.java b/src/main/java/com/parafield/storming/Icons.java index d656259..fd8bd23 100644 --- a/src/main/java/com/parafield/storming/Icons.java +++ b/src/main/java/com/parafield/storming/Icons.java @@ -63,6 +63,8 @@ private static ImageIcon loadIcon(String name, int width, int height) { public static final ImageIcon EXE_ICON = loadIcon("exe-icon", 18, 18); public static final ImageIcon GIT = loadIcon("Git", 18, 18); + public static final ImageIcon COMMIT = loadIcon("commit", 18, 18); + public static final ImageIcon PR = loadIcon("PR", 18, 18); public static final ImageIcon GRID = loadIcon("grid", 16, 16); public static final ImageIcon MAGNET = loadIcon("magnet", 16, 16); public static final ImageIcon PLUS = loadIcon("plus", 16, 16); diff --git a/src/main/java/com/parafield/storming/ui/panels/GitPanel.java b/src/main/java/com/parafield/storming/ui/panels/GitPanel.java new file mode 100644 index 0000000..86b3ff3 --- /dev/null +++ b/src/main/java/com/parafield/storming/ui/panels/GitPanel.java @@ -0,0 +1,110 @@ +package com.parafield.storming.ui.panels; + +import com.formdev.flatlaf.FlatClientProperties; +import com.parafield.storming.Icons; +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; + +public class GitPanel extends JPanel { + + private final JPanel changesList; + private final JTextArea commitMessage; + private final JLabel branchLabel; + + public GitPanel() { + setLayout(new BorderLayout()); + + // --- 1. Header (Branch Info) --- + JPanel header = new JPanel(new BorderLayout()); + header.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("Component.borderColor"))); + header.setPreferredSize(new Dimension(0, 32)); + header.setBackground(UIManager.getColor("Panel.background")); + + branchLabel = new JLabel(" master", Icons.GIT, SwingConstants.LEFT); + branchLabel.setFont(UIManager.getFont("defaultFont").deriveFont(Font.BOLD, 11f)); + header.add(branchLabel, BorderLayout.WEST); + + JPanel actions = new JPanel(new FlowLayout(FlowLayout.RIGHT, 5, 2)); + actions.setOpaque(false); + JButton refreshBtn = new JButton(Icons.RESTART); // Reuse icon + refreshBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); + refreshBtn.setToolTipText("Refresh Status"); + actions.add(refreshBtn); + header.add(actions, BorderLayout.EAST); + + add(header, BorderLayout.NORTH); + + // --- 2. Changes List --- + changesList = new JPanel(); + changesList.setLayout(new BoxLayout(changesList, BoxLayout.Y_AXIS)); + changesList.setBackground(UIManager.getColor("TextArea.background")); + + // Mock data for now + addChangeItem("src/main/java/MainWindow.java", "modified"); + addChangeItem("Engine/2D/src/Renderer.cpp", "modified"); + addChangeItem("assets/textures/player.png", "untracked"); + + JScrollPane scrollPane = new JScrollPane(changesList); + scrollPane.setBorder(null); + + // --- 3. Commit Section --- + JPanel commitSection = new JPanel(new BorderLayout(0, 5)); + commitSection.setBorder(new EmptyBorder(10, 10, 10, 10)); + + commitMessage = new JTextArea(); + commitMessage.putClientProperty(FlatClientProperties.PLACEHOLDER_TEXT, "Commit message..."); + commitMessage.setLineWrap(true); + commitMessage.setWrapStyleWord(true); + commitMessage.setFont(new Font("SansSerif", Font.PLAIN, 12)); + commitMessage.putClientProperty(FlatClientProperties.STYLE, "arc: 8; background: darken($Panel.background, 3%)"); + + JScrollPane msgScroll = new JScrollPane(commitMessage); + msgScroll.setPreferredSize(new Dimension(0, 80)); + msgScroll.setBorder(BorderFactory.createLineBorder(UIManager.getColor("Component.borderColor"))); + + JPanel btnPanel = new JPanel(new GridLayout(1, 2, 5, 0)); + JButton commitBtn = new JButton("Commit"); + commitBtn.putClientProperty(FlatClientProperties.STYLE, "background: #3498db; foreground: #ffffff; hoverBackground: #2980b9"); + + JButton pushBtn = new JButton("Commit and Push..."); + + btnPanel.add(commitBtn); + btnPanel.add(pushBtn); + + commitSection.add(msgScroll, BorderLayout.CENTER); + commitSection.add(btnPanel, BorderLayout.SOUTH); + + // --- Layout --- + JSplitPane split = new JSplitPane(JSplitPane.VERTICAL_SPLIT, scrollPane, commitSection); + split.setDividerLocation(300); + split.setDividerSize(3); + split.setBorder(null); + split.setResizeWeight(1.0); + + add(split, BorderLayout.CENTER); + } + + private void addChangeItem(String file, String status) { + JPanel item = new JPanel(new BorderLayout()); + item.setMaximumSize(new Dimension(Integer.MAX_VALUE, 28)); + item.setPreferredSize(new Dimension(0, 28)); + item.setOpaque(false); + item.setBorder(new EmptyBorder(0, 5, 0, 5)); + + JCheckBox cb = new JCheckBox(file); + cb.setSelected(true); + cb.setFont(UIManager.getFont("defaultFont").deriveFont(12f)); + + JLabel statusLbl = new JLabel(status); + statusLbl.setFont(UIManager.getFont("defaultFont").deriveFont(Font.ITALIC, 10f)); + statusLbl.setForeground(status.equals("untracked") ? new Color(155, 89, 182) : new Color(46, 204, 113)); + + item.add(cb, BorderLayout.CENTER); + item.add(statusLbl, BorderLayout.EAST); + + changesList.add(item); + } +} diff --git a/src/main/java/com/parafield/storming/ui/panels/PRDetailsCenterPanel.java b/src/main/java/com/parafield/storming/ui/panels/PRDetailsCenterPanel.java new file mode 100644 index 0000000..a7f4bce --- /dev/null +++ b/src/main/java/com/parafield/storming/ui/panels/PRDetailsCenterPanel.java @@ -0,0 +1,62 @@ +package com.parafield.storming.ui.panels; + +import com.formdev.flatlaf.FlatClientProperties; +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import java.awt.*; + +public class PRDetailsCenterPanel extends JPanel { + + public PRDetailsCenterPanel(String title, String author) { + setLayout(new BorderLayout()); + setBackground(UIManager.getColor("Panel.background")); + + // --- Header Section --- + JPanel header = new JPanel(); + header.setLayout(new BoxLayout(header, BoxLayout.Y_AXIS)); + header.setBorder(new EmptyBorder(20, 25, 15, 25)); + header.setOpaque(false); + + JLabel titleLabel = new JLabel(title); + titleLabel.setFont(new Font("SansSerif", Font.BOLD, 22)); + + JLabel authorLabel = new JLabel("Opened by " + author + " • 3 comments"); + authorLabel.setForeground(UIManager.getColor("Label.disabledForeground")); + authorLabel.setFont(new Font("SansSerif", Font.PLAIN, 13)); + + header.add(titleLabel); + header.add(Box.createVerticalStrut(5)); + header.add(authorLabel); + + // --- Tabs (Description / Logs) --- + JTabbedPane tabs = new JTabbedPane(); + tabs.putClientProperty(FlatClientProperties.TABBED_PANE_TAB_TYPE, FlatClientProperties.TABBED_PANE_TAB_TYPE_UNDERLINED); + + // Description Tab + JTextArea desc = new JTextArea("This pull request introduces the new centralized PR management system.\n\n" + + "Summary of changes:\n" + + "- Added PRPanel with list and detail views.\n" + + "- Integrated with MainWindow editor tabs.\n" + + "- Improved SideBar interaction."); + desc.setEditable(false); + desc.setOpaque(false); + desc.setLineWrap(true); + desc.setWrapStyleWord(true); + desc.setBorder(new EmptyBorder(10, 10, 10, 10)); + tabs.addTab("Description", new JScrollPane(desc)); + + // Logs Tab + JTextArea logs = new JTextArea("[SUCCESS] Build passed in 1m 24s\n" + + "[SUCCESS] All unit tests passed (124/124)\n" + + "[INFO] Deployed to staging-01"); + logs.setEditable(false); + logs.setFont(new Font("JetBrains Mono", Font.PLAIN, 12)); + logs.setBackground(new Color(20, 20, 25)); + logs.setForeground(new Color(46, 204, 113)); + logs.setBorder(new EmptyBorder(10, 10, 10, 10)); + tabs.addTab("Checks & Logs", new JScrollPane(logs)); + + add(header, BorderLayout.NORTH); + add(tabs, BorderLayout.CENTER); + } +} diff --git a/src/main/java/com/parafield/storming/ui/panels/PRDetailsSidePanel.java b/src/main/java/com/parafield/storming/ui/panels/PRDetailsSidePanel.java new file mode 100644 index 0000000..e00b7a6 --- /dev/null +++ b/src/main/java/com/parafield/storming/ui/panels/PRDetailsSidePanel.java @@ -0,0 +1,90 @@ +package com.parafield.storming.ui.panels; + +import com.formdev.flatlaf.FlatClientProperties; +import com.parafield.storming.Icons; +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import java.awt.*; + +public class PRDetailsSidePanel extends JPanel { + + private final Runnable onBack; + private final JPanel content; + + public PRDetailsSidePanel(String title, Runnable onBack) { + this.onBack = onBack; + setLayout(new BorderLayout()); + + // --- 1. Header (Back Button) --- + JPanel header = new JPanel(new BorderLayout()); + header.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("Component.borderColor"))); + header.setPreferredSize(new Dimension(0, 32)); + header.setBackground(UIManager.getColor("Panel.background")); + + JButton backBtn = new JButton("← Back"); + backBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); + backBtn.addActionListener(e -> onBack.run()); + header.add(backBtn, BorderLayout.WEST); + + add(header, BorderLayout.NORTH); + + // --- 2. Changed Files & Checks --- + content = new JPanel(); + content.setLayout(new BoxLayout(content, BoxLayout.Y_AXIS)); + content.setBorder(new EmptyBorder(10, 10, 10, 10)); + + JLabel titleLbl = new JLabel("Files Changed"); + titleLbl.setFont(UIManager.getFont("defaultFont").deriveFont(Font.BOLD, 11f)); + titleLbl.setForeground(UIManager.getColor("Label.disabledForeground")); + titleLbl.setAlignmentX(Component.LEFT_ALIGNMENT); + content.add(titleLbl); + content.add(Box.createVerticalStrut(10)); + + addFileItem("src/main/ui/PRPanel.java", "+42 -12"); + addFileItem("src/main/ui/MainWindow.java", "+15 -5"); + addFileItem("Engine/Core/Log.cpp", "+2 -2"); + + content.add(Box.createVerticalStrut(20)); + + JLabel checkLbl = new JLabel("Checks (3 Passed)"); + checkLbl.setFont(UIManager.getFont("defaultFont").deriveFont(Font.BOLD, 11f)); + checkLbl.setForeground(new Color(46, 204, 113)); + checkLbl.setAlignmentX(Component.LEFT_ALIGNMENT); + content.add(checkLbl); + + addCheckItem("Build", true); + addCheckItem("Unit Tests", true); + addCheckItem("Linter", true); + + JScrollPane scrollPane = new JScrollPane(content); + scrollPane.setBorder(null); + add(scrollPane, BorderLayout.CENTER); + } + + private void addFileItem(String name, String diff) { + JPanel item = new JPanel(new BorderLayout()); + item.setMaximumSize(new Dimension(Integer.MAX_VALUE, 26)); + item.setOpaque(false); + item.setAlignmentX(Component.LEFT_ALIGNMENT); + + JLabel nameLbl = new JLabel(name); + nameLbl.setFont(new Font("SansSerif", Font.PLAIN, 12)); + + JLabel diffLbl = new JLabel(diff); + diffLbl.setFont(new Font("Monospaced", Font.BOLD, 11)); + diffLbl.setForeground(new Color(46, 204, 113)); + + item.add(nameLbl, BorderLayout.CENTER); + item.add(diffLbl, BorderLayout.EAST); + + content.add(item); + } + + private void addCheckItem(String name, boolean success) { + JLabel lbl = new JLabel(" ✓ " + name); + lbl.setFont(new Font("SansSerif", Font.PLAIN, 12)); + lbl.setForeground(UIManager.getColor("Label.foreground")); + lbl.setAlignmentX(Component.LEFT_ALIGNMENT); + content.add(lbl); + } +} diff --git a/src/main/java/com/parafield/storming/ui/panels/PRPanel.java b/src/main/java/com/parafield/storming/ui/panels/PRPanel.java new file mode 100644 index 0000000..acb82d9 --- /dev/null +++ b/src/main/java/com/parafield/storming/ui/panels/PRPanel.java @@ -0,0 +1,110 @@ +package com.parafield.storming.ui.panels; + +import com.formdev.flatlaf.FlatClientProperties; +import com.parafield.storming.Icons; +import com.parafield.storming.ui.windows.MainWindow; +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +public class PRPanel extends JPanel { + + private final JPanel prList; + private final CardLayout cardLayout; + private final JPanel mainContainer; + + public PRPanel() { + setLayout(new BorderLayout()); + + cardLayout = new CardLayout(); + mainContainer = new JPanel(cardLayout); + + // --- 1. PR List View --- + JPanel listView = new JPanel(new BorderLayout()); + + JPanel header = new JPanel(new BorderLayout()); + header.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("Component.borderColor"))); + header.setPreferredSize(new Dimension(0, 32)); + header.setBackground(UIManager.getColor("Panel.background")); + + JLabel title = new JLabel(" Pull Requests", Icons.PR, SwingConstants.LEFT); + title.setFont(UIManager.getFont("defaultFont").deriveFont(Font.BOLD, 11f)); + header.add(title, BorderLayout.WEST); + + JButton createBtn = new JButton(Icons.PLUS); + createBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); + createBtn.setToolTipText("New Pull Request"); + header.add(createBtn, BorderLayout.EAST); + + listView.add(header, BorderLayout.NORTH); + + prList = new JPanel(); + prList.setLayout(new BoxLayout(prList, BoxLayout.Y_AXIS)); + prList.setBackground(UIManager.getColor("TextArea.background")); + + addPRItem("#42: Refactor Renderer API", "batista", "2 hours ago"); + addPRItem("#41: Add Vulkan backend support", "parafield", "Yesterday"); + addPRItem("#40: Fix crash on window resize", "contributor1", "3 days ago"); + + JScrollPane scrollPane = new JScrollPane(prList); + scrollPane.setBorder(null); + listView.add(scrollPane, BorderLayout.CENTER); + + JButton createPRBigBtn = new JButton("Create Pull Request..."); + createPRBigBtn.putClientProperty(FlatClientProperties.STYLE, "background: #27ae60; foreground: #ffffff;"); + JPanel footer = new JPanel(new BorderLayout()); + footer.setBorder(new EmptyBorder(10, 10, 10, 10)); + footer.add(createPRBigBtn, BorderLayout.CENTER); + listView.add(footer, BorderLayout.SOUTH); + + mainContainer.add(listView, "LIST"); + add(mainContainer, BorderLayout.CENTER); + } + + private void addPRItem(String title, String author, String time) { + JPanel item = new JPanel(); + item.setLayout(new BoxLayout(item, BoxLayout.Y_AXIS)); + item.setMaximumSize(new Dimension(Integer.MAX_VALUE, 50)); + item.setPreferredSize(new Dimension(0, 50)); + item.setOpaque(false); + item.setBorder(BorderFactory.createCompoundBorder( + BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("Component.borderColor")), + BorderFactory.createEmptyBorder(8, 12, 8, 12) + )); + item.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); + + item.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + showDetails(title, author); + } + } + }); + + JLabel titleLabel = new JLabel(title); + titleLabel.setFont(UIManager.getFont("defaultFont").deriveFont(Font.BOLD, 12f)); + titleLabel.setAlignmentX(Component.LEFT_ALIGNMENT); + + JLabel infoLabel = new JLabel(author + " • " + time); + infoLabel.setFont(UIManager.getFont("defaultFont").deriveFont(10f)); + infoLabel.setForeground(UIManager.getColor("Label.disabledForeground")); + infoLabel.setAlignmentX(Component.LEFT_ALIGNMENT); + + item.add(titleLabel); + item.add(Box.createVerticalStrut(2)); + item.add(infoLabel); + + prList.add(item); + } + + public void showDetails(String title, String author) { + PRDetailsSidePanel detailView = new PRDetailsSidePanel(title, () -> cardLayout.show(mainContainer, "LIST")); + mainContainer.add(detailView, "DETAIL"); + cardLayout.show(mainContainer, "DETAIL"); + + MainWindow.getInstance().openPRDetails(title, author); + } +} diff --git a/src/main/java/com/parafield/storming/ui/panels/ProjectBrowserPanel.java b/src/main/java/com/parafield/storming/ui/panels/ProjectBrowserPanel.java new file mode 100644 index 0000000..c2bc09b --- /dev/null +++ b/src/main/java/com/parafield/storming/ui/panels/ProjectBrowserPanel.java @@ -0,0 +1,110 @@ +package com.parafield.storming.ui.panels; + +import com.formdev.flatlaf.FlatClientProperties; +import com.parafield.storming.Icons; +import javax.swing.*; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeCellRenderer; +import javax.swing.tree.DefaultTreeModel; +import java.awt.*; +import java.io.File; + +public class ProjectBrowserPanel extends JPanel { + + private final JTree fileTree; + private final File rootDir; + + public ProjectBrowserPanel() { + setLayout(new BorderLayout()); + + // Use current directory as root for now + rootDir = new File(System.getProperty("user.dir")); + + // --- 1. Toolbar --- + JToolBar toolbar = new JToolBar(); + toolbar.setFloatable(false); + toolbar.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("Component.borderColor"))); + + JButton refreshBtn = new JButton("Refresh"); + refreshBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); + refreshBtn.addActionListener(e -> refreshTree()); + + toolbar.add(Box.createHorizontalStrut(5)); + toolbar.add(refreshBtn); + toolbar.addSeparator(); + + JLabel pathLabel = new JLabel(rootDir.getAbsolutePath()); + pathLabel.setFont(UIManager.getFont("defaultFont").deriveFont(Font.PLAIN, 11f)); + pathLabel.setForeground(UIManager.getColor("Label.disabledForeground")); + toolbar.add(Box.createHorizontalStrut(10)); + toolbar.add(pathLabel); + + add(toolbar, BorderLayout.NORTH); + + // --- 2. File Tree --- + DefaultMutableTreeNode rootNode = createTreeNodes(rootDir); + fileTree = new JTree(new DefaultTreeModel(rootNode)); + fileTree.setCellRenderer(new FileTreeCellRenderer()); + fileTree.putClientProperty(FlatClientProperties.STYLE, "background: darken($Panel.background, 2%)"); + fileTree.setRowHeight(24); + fileTree.setShowsRootHandles(true); + + JScrollPane scrollPane = new JScrollPane(fileTree); + scrollPane.setBorder(null); + add(scrollPane, BorderLayout.CENTER); + } + + private void refreshTree() { + DefaultMutableTreeNode rootNode = createTreeNodes(rootDir); + fileTree.setModel(new DefaultTreeModel(rootNode)); + } + + private DefaultMutableTreeNode createTreeNodes(File file) { + DefaultMutableTreeNode node = new DefaultMutableTreeNode(file.getName().isEmpty() ? file.getPath() : file.getName()); + if (file.isDirectory()) { + File[] files = file.listFiles(); + if (files != null) { + // Sort files: directories first + java.util.Arrays.sort(files, (f1, f2) -> { + if (f1.isDirectory() && !f2.isDirectory()) return -1; + if (!f1.isDirectory() && f2.isDirectory()) return 1; + return f1.getName().compareToIgnoreCase(f2.getName()); + }); + for (File child : files) { + if (child.getName().startsWith(".")) continue; // Skip hidden files + node.add(createTreeNodes(child)); + } + } + } + return node; + } + + private static class FileTreeCellRenderer extends DefaultTreeCellRenderer { + @Override + public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean exp, boolean leaf, int row, boolean hasFocus) { + super.getTreeCellRendererComponent(tree, value, sel, exp, leaf, row, hasFocus); + if (leaf) { + setIcon(UIManager.getIcon("FileView.fileIcon")); + } else { + setIcon(Icons.FOLDER); + } + return this; + } + } + + @Override + protected void paintChildren(Graphics g) { + super.paintChildren(g); + Graphics2D g2 = (Graphics2D) g.create(); + g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.12f)); + + int size = 80; + int x = getWidth() - size - 25; + int y = getHeight() - size - 25; + if (Icons.FOLDER_80 != null) { + Icons.FOLDER_80.paintIcon(this, g2, x, y); + } + g2.dispose(); + } +} diff --git a/src/main/java/com/parafield/storming/ui/widgets/SideBar.java b/src/main/java/com/parafield/storming/ui/widgets/SideBar.java index 9af2707..f201915 100644 --- a/src/main/java/com/parafield/storming/ui/widgets/SideBar.java +++ b/src/main/java/com/parafield/storming/ui/widgets/SideBar.java @@ -5,7 +5,6 @@ import java.awt.*; public class SideBar extends JPanel { - private final ButtonGroup group = new ButtonGroup(); private final int barWidth; private float alpha = 1.0f; @@ -41,23 +40,31 @@ public AbstractButton addTab(String name, Icon icon, boolean isToggle, Runnable btn = new JToggleButton(icon) { @Override protected void paintComponent(Graphics g) { - super.paintComponent(g); if (isSelected()) { - g.setColor(new Color(52, 152, 219)); // Blue indicator + Graphics2D g2 = (Graphics2D) g.create(); + g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2.setColor(new Color(52, 152, 219, 30)); // Subtle blue background + g2.fillRect(0, 0, getWidth(), getHeight()); + + g2.setColor(new Color(52, 152, 219)); // Bright blue indicator if (barWidth < 50) { // Vertical sidebar - g.fillRect(0, 8, 2, getHeight() - 16); + g2.fillRect(0, 8, 2, getHeight() - 16); } else { // Horizontal (if used) - g.fillRect(8, getHeight() - 2, getWidth() - 16, 2); + g2.fillRect(8, getHeight() - 2, getWidth() - 16, 2); } + g2.dispose(); } + super.paintComponent(g); } }; - group.add(btn); } else { btn = new JButton(icon); } btn.setToolTipText(name); + btn.setFocusPainted(false); + btn.setBorderPainted(false); + btn.setContentAreaFilled(false); btn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); btn.setPreferredSize(new Dimension(barWidth, barWidth)); btn.setMaximumSize(new Dimension(barWidth, barWidth)); @@ -70,4 +77,20 @@ protected void paintComponent(Graphics g) { add(Box.createVerticalStrut(2)); return btn; } + + public void addSeparator() { + JPanel sep = new JPanel(); + sep.setMaximumSize(new Dimension(barWidth - 14, 1)); + sep.setPreferredSize(new Dimension(barWidth - 14, 1)); + sep.setBackground(UIManager.getColor("Component.borderColor")); + sep.setAlignmentX(Component.CENTER_ALIGNMENT); + + add(Box.createVerticalStrut(6)); + add(sep); + add(Box.createVerticalStrut(6)); + } + + public void addGlue() { + add(Box.createVerticalGlue()); + } } diff --git a/src/main/java/com/parafield/storming/ui/widgets/StormingMenuBar.java b/src/main/java/com/parafield/storming/ui/widgets/StormingMenuBar.java index 521f21b..a1b907a 100644 --- a/src/main/java/com/parafield/storming/ui/widgets/StormingMenuBar.java +++ b/src/main/java/com/parafield/storming/ui/widgets/StormingMenuBar.java @@ -5,11 +5,22 @@ import com.parafield.storming.ui.utils.UIUtils; import javax.swing.*; import java.awt.*; +import java.awt.event.AWTEventListener; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; public class StormingMenuBar extends JMenuBar { private float alpha = 1.0f; private final Runnable onPlay; private final Runnable onStop; + + private boolean expanded = false; + private final List menus = new ArrayList<>(); + private JButton projectBtn; + private JButton branchBtn; + private Component projectStrut; + private Component branchStrut; public StormingMenuBar(Runnable onPlay, Runnable onStop) { this.onPlay = onPlay; @@ -21,6 +32,43 @@ public StormingMenuBar(Runnable onPlay, Runnable onStop) { putClientProperty(FlatClientProperties.STYLE, "hoverBackground: #ffffff10;"); initMenuBar(); + setupClickOutDetection(); + } + + private void setupClickOutDetection() { + Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() { + @Override + public void eventDispatched(AWTEvent event) { + if (event instanceof MouseEvent me && me.getID() == MouseEvent.MOUSE_PRESSED) { + if (expanded && !SwingUtilities.isDescendingFrom(me.getComponent(), StormingMenuBar.this)) { + // Check if a menu is currently showing its popup + boolean anyMenuShowing = false; + for (JMenu m : menus) { + if (m.isPopupMenuVisible()) { + anyMenuShowing = true; + break; + } + } + if (!anyMenuShowing) { + SwingUtilities.invokeLater(() -> setMenuExpanded(false)); + } + } + } + } + }, AWTEvent.MOUSE_EVENT_MASK); + } + + private void setMenuExpanded(boolean expanded) { + this.expanded = expanded; + for (JMenu m : menus) { + m.setVisible(expanded); + } + projectBtn.setVisible(!expanded); + branchBtn.setVisible(!expanded); + projectStrut.setVisible(!expanded); + branchStrut.setVisible(!expanded); + revalidate(); + repaint(); } public void setAlpha(float alpha) { @@ -36,45 +84,38 @@ private void initMenuBar() { add(appLogo); add(Box.createHorizontalStrut(5)); - // Hamburger Menu (Contains File, Edit, View, etc.) + // Hamburger Menu JButton menuBtn = new JButton(Icons.HAMBURGER); menuBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); - menuBtn.addActionListener(e -> { - JPopupMenu menu = new JPopupMenu(); - - // File Submenu - JMenu fileMenu = new JMenu("File"); - fileMenu.add(new JMenuItem("New Project...")); - fileMenu.add(new JMenuItem("Open Project...")); - fileMenu.addSeparator(); - fileMenu.add(new JMenuItem("Save Scene")); - menu.add(fileMenu); - - // Edit Submenu - JMenu editMenu = new JMenu("Edit"); - editMenu.add(new JMenuItem("Undo")); - editMenu.add(new JMenuItem("Redo")); - menu.add(editMenu); - - // View Submenu - JMenu viewMenu = new JMenu("View"); - viewMenu.add(new JCheckBoxMenuItem("Hierarchy", true)); - viewMenu.add(new JCheckBoxMenuItem("Inspector", true)); - menu.add(viewMenu); - - menu.addSeparator(); - menu.add(new JMenuItem("Settings...")); - menu.add(new JMenuItem("Exit")); - - menu.show(menuBtn, 0, menuBtn.getHeight()); - }); + menuBtn.addActionListener(e -> setMenuExpanded(!expanded)); add(menuBtn); add(Box.createHorizontalStrut(12)); + // Main Menus (Hidden by default) + menus.add(createFileMenu()); + menus.add(createEditMenu()); + menus.add(createMenu("View")); + menus.add(createMenu("Navigate")); + menus.add(createMenu("Code")); + menus.add(createMenu("Build")); + menus.add(createMenu("Run")); + menus.add(createMenu("Git")); + menus.add(createMenu("Window")); + menus.add(createMenu("Help")); + + for (JMenu m : menus) { + m.setVisible(false); + m.setFont(UIManager.getFont("defaultFont").deriveFont(Font.PLAIN, 12f)); + add(m); + } + // Project Info (Center-ish) String projectName = "New Adventure"; - JButton projectBtn = new JButton(projectName, new Icon() { + projectStrut = Box.createHorizontalStrut(10); + add(projectStrut); + + projectBtn = new JButton(projectName, new Icon() { @Override public void paintIcon(Component c, Graphics g, int x, int y) { Graphics2D g2 = (Graphics2D) g.create(); @@ -94,9 +135,10 @@ public void paintIcon(Component c, Graphics g, int x, int y) { projectBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); add(projectBtn); - add(Box.createHorizontalStrut(10)); + branchStrut = Box.createHorizontalStrut(10); + add(branchStrut); - JButton branchBtn = new JButton("master", Icons.GIT); + branchBtn = new JButton("master", Icons.GIT); branchBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); add(branchBtn); @@ -120,8 +162,32 @@ public void paintIcon(Component c, Graphics g, int x, int y) { add(settingsBtn); } + private JMenu createFileMenu() { + JMenu menu = new JMenu("File"); + menu.add(new JMenuItem("New Project...", Icons.PLUS)); + menu.add(new JMenuItem("Open Project...", Icons.FOLDER)); + menu.addSeparator(); + menu.add(new JMenuItem("Save Scene", Icons.CLIPBOARD)); + menu.addSeparator(); + menu.add(new JMenuItem("Settings...", Icons.SETTINGS)); + menu.add(new JMenuItem("Exit")); + return menu; + } + + private JMenu createEditMenu() { + JMenu menu = new JMenu("Edit"); + menu.add(new JMenuItem("Undo")); + menu.add(new JMenuItem("Redo")); + menu.addSeparator(); + menu.add(new JMenuItem("Cut")); + menu.add(new JMenuItem("Copy")); + menu.add(new JMenuItem("Paste")); + return menu; + } + private JMenu createMenu(String title) { JMenu menu = new JMenu(title); + menu.add(new JMenuItem("Placeholder Action")); return menu; } @@ -135,14 +201,14 @@ protected void paintComponent(Graphics g) { g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha)); } - // Focused Linear Glow: Starts slightly inward but fills from absolute left + // Focused Linear Glow Color glowColor = new Color(52, 152, 219); LinearGradientPaint p = new LinearGradientPaint( 0, 0, 500, 0, - new float[]{0.0f, 0.15f, 0.5f, 1.0f}, // Added step to start peak further right + new float[]{0.0f, 0.15f, 0.5f, 1.0f}, new Color[]{ - new Color(glowColor.getRed(), glowColor.getGreen(), glowColor.getBlue(), 0), // Transparent at absolute left - new Color(glowColor.getRed(), glowColor.getGreen(), glowColor.getBlue(), 70), // Peak starts at ~75px + new Color(glowColor.getRed(), glowColor.getGreen(), glowColor.getBlue(), 0), + new Color(glowColor.getRed(), glowColor.getGreen(), glowColor.getBlue(), 70), new Color(glowColor.getRed(), glowColor.getGreen(), glowColor.getBlue(), 25), new Color(glowColor.getRed(), glowColor.getGreen(), glowColor.getBlue(), 0) } diff --git a/src/main/java/com/parafield/storming/ui/widgets/ToolWindow.java b/src/main/java/com/parafield/storming/ui/widgets/ToolWindow.java index 92f1e20..602bcee 100644 --- a/src/main/java/com/parafield/storming/ui/widgets/ToolWindow.java +++ b/src/main/java/com/parafield/storming/ui/widgets/ToolWindow.java @@ -10,10 +10,12 @@ public class ToolWindow extends JPanel { private final String title; private final JComponent content; private final JPanel header; + private final Runnable onHide; - public ToolWindow(String title, JComponent content) { + public ToolWindow(String title, JComponent content, Runnable onHide) { this.title = title; this.content = content; + this.onHide = onHide; setLayout(new BorderLayout()); setBorder(BorderFactory.createMatteBorder(0, 1, 0, 1, UIManager.getColor("Component.borderColor"))); @@ -43,6 +45,9 @@ public ToolWindow(String title, JComponent content) { hideBtn.setToolTipText("Hide"); hideBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); hideBtn.setPreferredSize(new Dimension(24, 24)); + if (onHide != null) { + hideBtn.addActionListener(e -> onHide.run()); + } actions.add(optionsBtn); actions.add(hideBtn); diff --git a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java index 9b86760..f14a54d 100644 --- a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java +++ b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java @@ -7,8 +7,13 @@ import com.parafield.storming.ui.panels.HierarchyPanel; import com.parafield.storming.ui.panels.InspectorPanel; import com.parafield.storming.ui.panels.NotificationsPanel; +import com.parafield.storming.ui.panels.ProjectBrowserPanel; +import com.parafield.storming.ui.panels.GitPanel; +import com.parafield.storming.ui.panels.PRPanel; +import com.parafield.storming.ui.panels.PRDetailsCenterPanel; import com.parafield.storming.ui.panels.SceneViewPanel; import com.parafield.storming.ui.panels.TerminalPanel; +import com.parafield.storming.ui.panels.HierarchyPanel; import com.parafield.storming.ui.widgets.SideBar; import com.parafield.storming.ui.widgets.ToolWindow; import com.parafield.storming.ui.widgets.StormingMenuBar; @@ -25,6 +30,7 @@ public class MainWindow extends JFrame { private JSplitPane mainHorizontalSplit; private JSplitPane rightSplit; private JSplitPane centerVerticalSplit; + private JSplitPane leftVerticalSplit; private StormingMenuBar menuBar; private SideBar leftBar; @@ -35,16 +41,35 @@ public class MainWindow extends JFrame { private JPanel rightCardPanel; private String currentRightTab = "INSPECTOR"; + private CardLayout leftUpperCardLayout; + private JPanel leftUpperCardPanel; + private String currentLeftUpperTab = "HIERARCHY"; + private boolean isLeftOpen = true; + private boolean isLeftUpperOpen = true; + private boolean isProjectOpen = true; private boolean isRightOpen = true; + private int leftSplitLastLoc = 280; private int rightSplitLastLoc = 280; + private int leftVerticalSplitLastLoc = 450; + private JToggleButton hierarchyBtn; + private JToggleButton commitBtn; + private JToggleButton prBtn; private JToggleButton projectBtn; private JToggleButton inspectorBtn; private JToggleButton notificationsBtn; + + private JTabbedPane editorTabs; + private static MainWindow instance; + + public static MainWindow getInstance() { + return instance; + } public MainWindow() { + instance = this; setTitle("Storming Engine"); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); setSize(1400, 900); @@ -98,11 +123,11 @@ private void initUI() { // --- 1. Right Side Panels --- rightCardLayout = new CardLayout(); rightCardPanel = new JPanel(rightCardLayout); - rightCardPanel.add(new ToolWindow("Inspector", new InspectorPanel()), "INSPECTOR"); - rightCardPanel.add(new ToolWindow("Notifications", new NotificationsPanel()), "NOTIFICATIONS"); + rightCardPanel.add(new ToolWindow("Inspector", new InspectorPanel(), () -> handleRightSidebarClick("INSPECTOR")), "INSPECTOR"); + rightCardPanel.add(new ToolWindow("Notifications", new NotificationsPanel(), () -> handleRightSidebarClick("NOTIFICATIONS")), "NOTIFICATIONS"); // --- 2. Center & Bottom Panels --- - JTabbedPane editorTabs = new JTabbedPane(); + editorTabs = new JTabbedPane(); editorTabs.putClientProperty(FlatClientProperties.TABBED_PANE_TAB_TYPE, FlatClientProperties.TABBED_PANE_TAB_TYPE_UNDERLINED); sceneViewPanel = new SceneViewPanel(); editorTabs.addTab("Scene", sceneViewPanel); @@ -114,12 +139,20 @@ private void initUI() { bottomTabs.addTab("Terminal", Icons.TERMINAL, new TerminalPanel()); // --- 3. Construct Layout Hierarchy --- - // Top: [ Hierarchy | [ Scene | Inspector ] ] + // Top: [ Hierarchy/Commit/PR | [ Scene | Inspector ] ] rightSplit = createSplit(JSplitPane.HORIZONTAL_SPLIT, editorTabs, rightCardPanel, 800, 0.0); - HierarchyPanel hierarchyPanel = new HierarchyPanel(); - ToolWindow hierarchyTW = new ToolWindow("Hierarchy", hierarchyPanel); - mainHorizontalSplit = createSplit(JSplitPane.HORIZONTAL_SPLIT, hierarchyTW, rightSplit, 280, 0.0); + leftUpperCardLayout = new CardLayout(); + leftUpperCardPanel = new JPanel(leftUpperCardLayout); + leftUpperCardPanel.add(new ToolWindow("Hierarchy", new HierarchyPanel(), () -> handleLeftUpperClick("HIERARCHY")), "HIERARCHY"); + leftUpperCardPanel.add(new ToolWindow("Commit", new GitPanel(), () -> handleLeftUpperClick("COMMIT")), "COMMIT"); + leftUpperCardPanel.add(new ToolWindow("Pull Requests", new PRPanel(), () -> handleLeftUpperClick("PR")), "PR"); + + ProjectBrowserPanel projectPanel = new ProjectBrowserPanel(); + ToolWindow projectTW = new ToolWindow("Project", projectPanel, this::toggleProject); + + leftVerticalSplit = createSplit(JSplitPane.VERTICAL_SPLIT, leftUpperCardPanel, projectTW, 450, 0.5); + mainHorizontalSplit = createSplit(JSplitPane.HORIZONTAL_SPLIT, leftVerticalSplit, rightSplit, 280, 0.0); // Final Vertical Split: Top Workspace / Bottom Tabs centerVerticalSplit = createSplit(JSplitPane.VERTICAL_SPLIT, mainHorizontalSplit, bottomTabs, 650, 0.0); @@ -127,10 +160,15 @@ private void initUI() { // --- 4. SideBars (JetBrains Style) --- leftBar = new SideBar(SwingConstants.VERTICAL, 40); leftBar.setAlpha(0.0f); - projectBtn = (JToggleButton) leftBar.addTab("Project", Icons.FOLDER, true, this::toggleLeftPanel); - projectBtn.setSelected(true); + hierarchyBtn = (JToggleButton) leftBar.addTab("Hierarchy", Icons.GRID, true, () -> handleLeftUpperClick("HIERARCHY")); + commitBtn = (JToggleButton) leftBar.addTab("Commit", Icons.COMMIT, true, () -> handleLeftUpperClick("COMMIT")); + prBtn = (JToggleButton) leftBar.addTab("Pull Requests", Icons.PR, true, () -> handleLeftUpperClick("PR")); + + leftBar.addSeparator(); + projectBtn = (JToggleButton) leftBar.addTab("Project", Icons.FOLDER, true, this::toggleProject); - leftBar.add(Box.createVerticalGlue()); + hierarchyBtn.setSelected(true); + projectBtn.setSelected(true); rightBar = new SideBar(SwingConstants.VERTICAL, 40); rightBar.setAlpha(0.0f); @@ -154,7 +192,56 @@ private void initUI() { root.add(statusBar, BorderLayout.SOUTH); } - private void toggleLeftPanel() { + public void openPRDetails(String title, String author) { + PRDetailsCenterPanel centerPanel = new PRDetailsCenterPanel(title, author); + editorTabs.addTab("PR: " + title.split(":")[0], Icons.PR, centerPanel); + editorTabs.setSelectedComponent(centerPanel); + } + + private void handleLeftUpperClick(String tabName) { + if (!isLeftUpperOpen) { + leftUpperCardLayout.show(leftUpperCardPanel, tabName); + currentLeftUpperTab = tabName; + UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplitLastLoc, 250); + isLeftUpperOpen = true; + if (!isLeftOpen) toggleLeftDrawer(); + } else { + if (currentLeftUpperTab.equals(tabName)) { + if (isProjectOpen) { + leftVerticalSplitLastLoc = leftVerticalSplit.getDividerLocation(); + UIAnimator.animateSplit(leftVerticalSplit, 0, 250); + } else { + toggleLeftDrawer(); + } + isLeftUpperOpen = false; + } else { + leftUpperCardLayout.show(leftUpperCardPanel, tabName); + currentLeftUpperTab = tabName; + } + } + updateLeftBar(); + } + + private void toggleProject() { + if (isProjectOpen) { + if (isLeftUpperOpen) { + leftVerticalSplitLastLoc = leftVerticalSplit.getDividerLocation(); + UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplit.getHeight(), 250); + } else { + toggleLeftDrawer(); + } + } else { + if (isLeftUpperOpen) { + UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplitLastLoc, 250); + } else { + toggleLeftDrawer(); + } + } + isProjectOpen = !isProjectOpen; + updateLeftBar(); + } + + private void toggleLeftDrawer() { if (isLeftOpen) { leftSplitLastLoc = mainHorizontalSplit.getDividerLocation(); UIAnimator.animateSplit(mainHorizontalSplit, 0, 250); @@ -162,7 +249,22 @@ private void toggleLeftPanel() { UIAnimator.animateSplit(mainHorizontalSplit, leftSplitLastLoc, 250); } isLeftOpen = !isLeftOpen; - projectBtn.setSelected(isLeftOpen); + } + + private void updateLeftBar() { + hierarchyBtn.setSelected(isLeftUpperOpen && isLeftOpen && currentLeftUpperTab.equals("HIERARCHY")); + commitBtn.setSelected(isLeftUpperOpen && isLeftOpen && currentLeftUpperTab.equals("COMMIT")); + prBtn.setSelected(isLeftUpperOpen && isLeftOpen && currentLeftUpperTab.equals("PR")); + projectBtn.setSelected(isProjectOpen && isLeftOpen); + + // If both are closed, close the whole drawer + if (!isLeftUpperOpen && !isProjectOpen && isLeftOpen) { + toggleLeftDrawer(); + } + // If opening one when drawer is closed, open the drawer + else if ((isLeftUpperOpen || isProjectOpen) && !isLeftOpen) { + toggleLeftDrawer(); + } } private void handleRightSidebarClick(String tabName) { diff --git a/src/main/resources/com/parafield/storming/icons/PR.png b/src/main/resources/com/parafield/storming/icons/PR.png new file mode 100644 index 0000000..c72cedb Binary files /dev/null and b/src/main/resources/com/parafield/storming/icons/PR.png differ diff --git a/src/main/resources/com/parafield/storming/icons/PR.svg b/src/main/resources/com/parafield/storming/icons/PR.svg new file mode 100644 index 0000000..0306181 --- /dev/null +++ b/src/main/resources/com/parafield/storming/icons/PR.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/com/parafield/storming/icons/Structure.png b/src/main/resources/com/parafield/storming/icons/Structure.png new file mode 100644 index 0000000..111ea16 Binary files /dev/null and b/src/main/resources/com/parafield/storming/icons/Structure.png differ diff --git a/src/main/resources/com/parafield/storming/icons/Structure.svg b/src/main/resources/com/parafield/storming/icons/Structure.svg new file mode 100644 index 0000000..20a6475 --- /dev/null +++ b/src/main/resources/com/parafield/storming/icons/Structure.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/com/parafield/storming/icons/commit.png b/src/main/resources/com/parafield/storming/icons/commit.png new file mode 100644 index 0000000..56cfb02 Binary files /dev/null and b/src/main/resources/com/parafield/storming/icons/commit.png differ diff --git a/src/main/resources/com/parafield/storming/icons/commit.svg b/src/main/resources/com/parafield/storming/icons/commit.svg new file mode 100644 index 0000000..9b69911 --- /dev/null +++ b/src/main/resources/com/parafield/storming/icons/commit.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file