Merge pull request #78 from tiwiz/native-look-and-feel

Native look and feel

Author: borisf

ClassySharkWS/resources/ic_back.png

@@ -40,16 +40,11 @@ public void run() {
         });
     }
 
-    private static void setParamsForOtherPlatforms() throws Exception {
-        UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
-        UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
-    }
-
     private static void buildAndShowClassyShark(List<String> cmdLineArgs) {
         try {
-            UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
         } catch (UnsupportedLookAndFeelException | IllegalAccessException | ClassNotFoundException
-                | InstantiationException ex) {
+                | InstantiationException | SecurityException ex) {
             ex.printStackTrace();
         }
 

ClassySharkWS/resources/ic_export.png

@@ -91,21 +91,6 @@ public ClassySharkPanel(JFrame frame, File archive) {
 
     public ClassySharkPanel(JFrame frame) {
         super(false);
-        UIManager.put("swing.boldMetal", Boolean.FALSE);
-        UIManager.put("Button.select", Color.GRAY);
-        UIManager.put("ToggleButton.select", Color.GRAY);
-
-        UIManager.put("TabbedPane.contentAreaColor ", ColorScheme.LIGHT_GRAY);
-        UIManager.put("TabbedPane.selected", ColorScheme.BLACK);
-        UIManager.put("TabbedPane.background", ColorScheme.LIGHT_GRAY);
-        UIManager.put("TabbedPane.shadow", ColorScheme.FOREGROUND_CYAN);
-        UIManager.put("TabbedPane.darkShadow", ColorScheme.LIGHT_GRAY);
-        UIManager.put("TabbedPane.foreground", ColorScheme.FOREGROUND_CYAN);
-        UIManager.put("TabbedPane.unselectedTabForeground", ColorScheme.FOREGROUND_CYAN);
-        UIManager.put("TabbedPane.selectedForeground", ColorScheme.FOREGROUND_CYAN);
-        UIManager.put("TabbedPane.tabInsets", new Insets(5, 10, 5, 10));
-        UIManager.put("TabbedPane.font", new Font("SansSerif", Font.BOLD, 16));
-
         buildUI();
         parentFrame = frame;
         toolbar.setText("");
@@ -283,8 +268,6 @@ private void buildUI() {
         BorderLayout borderLayout = new BorderLayout();
         setLayout(borderLayout);
 
-        setBackground(ColorScheme.BLACK);
-
         ringChartPanel = new RingChartPanel(this);
 
         toolbar = new Toolbar(this);
@@ -296,12 +279,11 @@ private void buildUI() {
 
         filesTree = new FilesTree(this);
         JTabbedPane jTabbedPane = new JTabbedPane();
-        jTabbedPane.setBackground(ColorScheme.BACKGROUND);
         JScrollPane leftScrollPane = new JScrollPane(filesTree.getJTree());
 
-        jTabbedPane.addTab("Archive", leftScrollPane);
+        jTabbedPane.addTab("Classes", leftScrollPane);
         methodsCountPanel = new MethodsCountPanel(this);
-        jTabbedPane.addTab("Packages", methodsCountPanel);
+        jTabbedPane.addTab("Methods count", methodsCountPanel);
 
         jTabbedPane.addChangeListener(new ChangeListener() {
             @Override
@@ -318,7 +300,6 @@ public void stateChanged(ChangeEvent e) {
         });
 
         jSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
-        jSplitPane.setBackground(ColorScheme.BACKGROUND);
         jSplitPane.setDividerSize(3);
         jSplitPane.setPreferredSize(new Dimension(1000, 700));
 

ClassySharkWS/resources/ic_history.png

@@ -24,13 +24,10 @@
 public class ColorScheme {
     private ColorScheme(){}
 
-    public static final Color BACKGROUND = new Color(0x2b, 0x2b, 0x2b);
-    public static final Color FOREGROUND_YELLOW = new Color(0xFF, 0xFF, 0x80);
-    public static final Color FOREGROUND_ORANGE = new Color(0xFF, 0x99, 0x33);
-    public static final Color FOREGROUND_CYAN = new Color(0xd8, 0xd8, 0xd8);
-    public static final Color WHITE = Color.white;
-    public static final Color BLACK = Color.black;
-    public static final Color FOREGROUND_YELLOW_ANNOTATIONS = new Color(0xBB, 0xB5, 0x29);
+    public static final Color DEFAULT = new Color(0x61, 0x62, 0x7C);
+    public static final Color KEYWORDS = new Color(0xAA, 0x7D, 0x29);
+    public static final Color IDENTIFIERS = new Color(0x78, 0x8A, 0x4);
+    public static final Color ANNOTATIONS = new Color(0xD2, 0x16, 0x5B);
     public static final Color SELECTION_BG = new Color(0x21, 0x42, 0x83);
-    public static final Color LIGHT_GRAY = new Color(0x58, 0x58, 0x58);
+    public static final Color NAMES = new Color(0x61, 0x62, 0x7C);
 }

ClassySharkWS/resources/ic_menu.png

@@ -0,0 +1,15 @@
+package com.google.classyshark.gui.panel;
+
+
+public class IconSchemes {
+
+    private static final String ROOT_PATH = "resources/";
+    private static final String EXTENSION = ".png";
+
+    public static final String TOGGLE_ICON_PATH = ROOT_PATH + "ic_menu" + EXTENSION;
+    public static final String RECENT_ICON_PATH = ROOT_PATH + "ic_history" + EXTENSION;
+    public static final String BACK_ICON_PATH = ROOT_PATH + "ic_back" + EXTENSION;
+    public static final String NEXT_ICON_PATH = ROOT_PATH + "ic_next" + EXTENSION;
+    public static final String OPEN_ICON_PATH = ROOT_PATH + "ic_open" + EXTENSION;
+    public static final String EXPORT_ICON_PATH = ROOT_PATH + "ic_export" + EXTENSION;
+}