Initial commit

ahatem · Sep 13, 2022 · b157bbc · b157bbc
1 parent 31da60a
commit b157bbc
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/README.md b/README.md
@@ -2,7 +2,8 @@
 
 Simple swing calculator with simple math expression parser
 
-![Screenshot](/images/1.png?raw=true)
+![Screenshot Dark](/images/1.png?raw=true)
+![Screenshot Light](/images/2.png?raw=true)
 
 ---
 

diff --git a/images/1.png b/images/1.png
diff --git a/images/2.png b/images/2.png
diff --git a/src/main/java/main/Main.java b/src/main/java/main/Main.java
@@ -1,6 +1,6 @@
 package main;
 
-import com.formdev.flatlaf.intellijthemes.FlatHiberbeeDarkIJTheme;
+import com.formdev.flatlaf.intellijthemes.FlatCyanLightIJTheme;
 import main.ui.CalculatorFrame;
 
 import javax.swing.*;
@@ -9,8 +9,10 @@ public class Main {
   public static void main(String[] args) {
     UIManager.put("Button.arc", 0);
     UIManager.put("Button.innerFocusWidth", 0);
-    FlatHiberbeeDarkIJTheme.setup();
+    UIManager.put("Component.focusWidth", 0);
 
+//    FlatHiberbeeDarkIJTheme.setup(); // Dark Theme
+    FlatCyanLightIJTheme.setup(); // Light Theme
     SwingUtilities.invokeLater(CalculatorFrame::new);
   }
 }
diff --git a/src/main/java/main/math_evaluator/parser/ExpressionParser.java b/src/main/java/main/math_evaluator/parser/ExpressionParser.java
@@ -28,7 +28,7 @@ private String convertToPostfixExpression(String expression) {
         // empty spaces in " %c " are important cuz we use it to split the expression into tokens (in buildExpression)
         while (stack.peek() != '(')
           postfixExpression.append(" %c ".formatted(stack.pop()));
-        stack.pop();
+        stack.pop(); // to pop '('
       } else {
         while (!stack.isEmpty() && (priority(character) <= priority(stack.peek())))
           postfixExpression.append(" %c ".formatted(stack.pop()));

diff --git a/src/main/java/main/ui/CalculatorFrame.java b/src/main/java/main/ui/CalculatorFrame.java
@@ -15,7 +15,7 @@ public class CalculatorFrame extends JFrame {
 
   public CalculatorFrame() {
     super("Simple Calculator");
-    setPreferredSize(new Dimension(290, 400));
+    setPreferredSize(new Dimension(330, 430));
     setMinimumSize(new Dimension(290, 400));
     setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);