New GUI theme: Carbon Fiber (#12733)

Co-authored-by: TandEm <tandem@users.noreply.github.com>

Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java

@@ -286,12 +286,12 @@ public class PlayerPanelExt extends javax.swing.JPanel {
             lifeLabel.setFont(font);
             changedFontLife = false;
         }
-        setTextForLabel("life", lifeLabel, life, playerLife, true);
+        setTextForLabel("life", lifeLabel, life, playerLife, false, PreferencesDialog.getCurrentTheme().getTextColor());
         setTextForLabel("poison", poisonLabel, poison, counterOfName(player, "poison"), false);
         setTextForLabel("energy", energyLabel, energy, counterOfName(player, "energy"), false);
         setTextForLabel("experience", experienceLabel, experience, counterOfName(player, "experience"), false);
         setTextForLabel("rad", radLabel, rad, counterOfName(player, "rad"), false);
-        setTextForLabel("hand zone", handLabel, hand, player.getHandCount(), true);
+        setTextForLabel("hand zone", handLabel, hand, player.getHandCount(), false, PreferencesDialog.getCurrentTheme().getTextColor());
         int libraryCards = player.getLibraryCount();
         if (libraryCards > 99) {
             Font font = libraryLabel.getFont();
@@ -304,7 +304,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
             libraryLabel.setFont(font);
             changedFontLibrary = false;
         }
-        setTextForLabel("library zone", libraryLabel, library, libraryCards, true);
+        setTextForLabel("library zone", libraryLabel, library, libraryCards, false, PreferencesDialog.getCurrentTheme().getTextColor());
 
         int graveCards = player.getGraveyard().size();
         if (graveCards > 99) {
@@ -321,7 +321,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
             changedFontGrave = false;
         }
 
-        Color graveColor = isCardsPlayable(player.getGraveyard().values(), game, possibleTargets) ? activeValueColor : Color.BLACK;
+        Color graveColor = isCardsPlayable(player.getGraveyard().values(), game, possibleTargets) ? activeValueColor : PreferencesDialog.getCurrentTheme().getTextColor();
         setTextForLabel("graveyard zone", graveLabel, grave, graveCards, false, graveColor);
         graveLabel.setToolTipText("Card Types: " + qtyCardTypes(player.getGraveyard()));
 
@@ -339,7 +339,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
         setTextForLabel("command zone", commandLabel, commandZone, player.getCommandObjectList().size(), false, commandColor);
 
         int exileCards = player.getExile().size();
-        Color excileColor = isCardsPlayable(player.getExile().values(), game, possibleTargets) ? activeValueColor : Color.BLACK;
+        Color exileColor = isCardsPlayable(player.getExile().values(), game, possibleTargets) ? activeValueColor : PreferencesDialog.getCurrentTheme().getTextColor();
         if (exileCards > 99) {
             if (!changedFontExile) {
                 Font font = exileLabel.getFont();
@@ -353,7 +353,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
             exileLabel.setFont(font);
             changedFontExile = false;
         }
-        setTextForLabel("exile zone", exileLabel, exileZone, exileCards, false, excileColor);
+        setTextForLabel("exile zone", exileLabel, exileZone, exileCards, false, exileColor);
 
         if (!MageFrame.isLite()) {
             int id = player.getUserData().getAvatarId();

Mage.Client/src/main/java/mage/client/themes/ThemeType.java

@@ -34,7 +34,8 @@ public enum ThemeType {
             // card icons
             new Color(169, 176, 190),
             Color.black,
-            new Color(51, 98, 140)
+            new Color(51, 98, 140),
+            Color.black
     ),
     GREY("Grey",
             "grey-theme/",
@@ -57,6 +58,7 @@ public enum ThemeType {
             // card icons
             new Color(158, 158, 158),
             Color.black,
+            Color.black,
             Color.black
     ),
     SUNSET_VAPORWAVE("Vaporwave Sunset",
@@ -80,7 +82,8 @@ public enum ThemeType {
             // card icons
             new Color(246, 136, 158),
             Color.black,
-            new Color(106, 0, 255)
+            new Color(106, 0, 255),
+            Color.black
     ),
     COFFEE("Coffee",
             "coffee-theme/",
@@ -103,7 +106,8 @@ public enum ThemeType {
             // card icons
             new Color(219, 193, 172),
             Color.black,
-            new Color(97, 27, 0)
+            new Color(97, 27, 0),
+            Color.black
     ),
     ISLAND("Island",
             "island-theme/",
@@ -121,12 +125,36 @@ public enum ThemeType {
             new Color(0, 78, 97), // nimbusBase
             new Color(172, 195, 219), // mageToolbar
             new Color(172, 195, 219), // playerPanel_inactiveBackgroundColor
-            new Color(204, 236, 201), // playerPanel_inactiveBackgroundColor
+            new Color(204, 236, 201), // playerPanel_activeBackgroundColor
             new Color(50, 68, 99, 255), // playerPanel_deadBackgroundColor
             // card icons
             new Color(172, 197, 219),
             Color.black,
-            new Color(0, 78, 97)
+            new Color(0, 78, 97),
+            Color.black
+    ),
+    CARBON_FIBER("Carbon Fiber",
+            "carbon_fiber-theme/",
+            true,
+            true,
+            true,
+            true,
+            true,
+            true,
+            true,
+            new Color(43, 45, 49), // buttons, scrollar background, disabled inputs
+            new Color(49, 51, 56), // window background
+            new Color(58, 56, 64), // inputs, table rows
+            new Color(58, 56, 64), // tooltips
+            new Color(25, 25, 25), // title bars, scrollbar foreground
+            new Color(43, 45, 49), // mageToolbar
+            new Color(43, 45, 49), // playerPanel_inactiveBackgroundColor
+            new Color(64, 61, 56), // playerPanel_activeBackgroundColor
+            new Color(50, 68, 99, 255), // playerPanel_deadBackgroundColor
+            new Color(172, 197, 219),
+            Color.BLACK,
+            new Color(0, 78, 97),
+            new Color(220, 220, 220)
     );
 
     private final String name;
@@ -151,6 +179,9 @@ public enum ThemeType {
     private final Color cardIconsFillColor;
     private final Color cardIconsStrokeColor;
     private final Color cardIconsTextColor;
+    private final Color textColor;
+
+    //private final Color nimbusSelection;
 
     ThemeType(String name,
               String path,
@@ -172,7 +203,8 @@ public enum ThemeType {
               Color playerPanel_deadBackgroundColor,
               Color cardIconsFillColor,
               Color cardIconsStrokeColor,
-              Color cardIconsTextColor
+              Color cardIconsTextColor,
+	          Color textColor
     ) {
         this.name = name;
         this.path = path;
@@ -195,6 +227,7 @@ public enum ThemeType {
         this.cardIconsFillColor = cardIconsFillColor;
         this.cardIconsStrokeColor = cardIconsStrokeColor;
         this.cardIconsTextColor = cardIconsTextColor;
+	    this.textColor = textColor;
     }
 
     @Override
@@ -243,6 +276,10 @@ public enum ThemeType {
         return mageToolbar;
     }
 
+    public Color getTextColor() {
+        return textColor;
+    }
+
     public Color getPlayerPanel_inactiveBackgroundColor() {
         return playerPanel_inactiveBackgroundColor;
     }
@@ -353,4 +390,4 @@ public enum ThemeType {
         // reload card icons and other rendering things from cache - it can depend on current theme
         GUISizeHelper.refreshGUIAndCards(true);
     }
-}
+}

Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java

@@ -494,6 +494,8 @@ public final class GuiDisplayUtil {
         UIManager.put("info", PreferencesDialog.getCurrentTheme().getInfo()); // tooltips
         UIManager.put("nimbusBase", PreferencesDialog.getCurrentTheme().getNimbusBase()); // title bars, scrollbar foreground
 
+	    UIManager.put("text", PreferencesDialog.getCurrentTheme().getTextColor()); // Default text color
+
         //UIManager.put("nimbusDisabledText", Color.green); // TODO: improve disabled color
         //UIManager.put("Table.rowHeight", GUISizeHelper.tableRowHeight);
 

Mage.Client/src/main/java/mage/client/util/stats/UpdateMemUsageTask.java

@@ -1,4 +1,5 @@
 package mage.client.util.stats;
+import mage.client.dialog.PreferencesDialog;
 
 import java.awt.*;
 import java.util.List;
@@ -75,7 +76,7 @@ public class UpdateMemUsageTask extends SwingWorker<Void, MemoryStats> {
                             + "Application memory limit almost reached. Errors and freezes are very possible.";
 
                 }else{
-                    jLabelToDisplayInfo.setForeground(Color.black);
+                    jLabelToDisplayInfo.setForeground(PreferencesDialog.getCurrentTheme().getTextColor());
                 }
 
                 this.jLabelToDisplayInfo.setToolTipText("<html>Memory usage statistics" + warning + optimizeHint);