From 4bc664f3f21b5ea417f7b5885264850f0b66a60d Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Fri, 19 Aug 2022 23:29:18 +0200
Subject: [PATCH] #400 - set default account font color to appropriate text
color
---
.../deadlocker8/budgetmaster/accounts/Account.java | 14 ++++++++++----
.../src/main/resources/static/css/accounts.css | 4 ++--
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
index 2b5e19b53..df60b22c6 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
@@ -15,7 +15,8 @@ import java.util.Objects;
@Entity
public class Account implements ProvidesID, Iconizable
{
- private static final String ACCOUNT_FONT_COLOR = "#2E79B9";
+ private static final String FONT_COLOR_LIGHT_THEME = "#212121";
+ private static final String FONT_COLOR_DARK_THEME = "#FFFFFF";
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -162,13 +163,13 @@ public class Account implements ProvidesID, Iconizable
final Icon icon = getIconReference();
if(icon == null)
{
- return ACCOUNT_FONT_COLOR;
+ return getDefaultFontColor(isDarkTheme);
}
final String fontColor = icon.getFontColor();
if(fontColor == null)
{
- return ACCOUNT_FONT_COLOR;
+ return getDefaultFontColor(isDarkTheme);
}
return fontColor;
@@ -177,7 +178,12 @@ public class Account implements ProvidesID, Iconizable
@Override
public String getDefaultFontColor(boolean isDarkTheme)
{
- return ACCOUNT_FONT_COLOR;
+ if(isDarkTheme)
+ {
+ return FONT_COLOR_DARK_THEME;
+ }
+
+ return FONT_COLOR_LIGHT_THEME;
}
@Override
diff --git a/BudgetMasterServer/src/main/resources/static/css/accounts.css b/BudgetMasterServer/src/main/resources/static/css/accounts.css
index ac8698d37..189526f80 100644
--- a/BudgetMasterServer/src/main/resources/static/css/accounts.css
+++ b/BudgetMasterServer/src/main/resources/static/css/accounts.css
@@ -28,6 +28,6 @@
}
.account-square-border {
- border: 3px solid var(--color-blue);
- line-height: 28px !important;
+ border: 3px solid var(--color-text);
+ line-height: 32px !important;
}
--
GitLab