fixed default icon font color for templates in light theme

src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java

@@ -146,7 +146,7 @@ public class Account implements ProvidesID, Iconizable
 	}
 
 	@Override
-	public String getFontColor()
+	public String getFontColor(boolean isDarkTheme)
 	{
 		final Icon icon = getIconReference();
 		if(icon == null)

src/main/java/de/deadlocker8/budgetmaster/categories/Category.java

@@ -110,7 +110,7 @@ public class Category implements ProvidesID, Iconizable
 	}
 
 	@Override
-	public String getFontColor()
+	public String getFontColor(boolean isDarkTheme)
 	{
 		final Icon icon = getIconReference();
 		if(icon == null)

src/main/java/de/deadlocker8/budgetmaster/icon/Iconizable.java

@@ -31,5 +31,5 @@ public interface Iconizable extends ProvidesID
 		this.setIconReference(icon);
 	}
 
-	String getFontColor();
+	String getFontColor(boolean isDarkTheme);
 }

src/main/java/de/deadlocker8/budgetmaster/templates/Template.java

@@ -18,6 +18,9 @@ import java.util.Objects;
 @Entity
 public class Template implements TransactionBase, Iconizable
 {
+	private static final String FONT_COLOR_LIGHT_THEME = "#212121";
+	private static final String FONT_COLOR_DARK_THEME = "#FFFFFF";
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Expose
@@ -213,23 +216,34 @@ public class Template implements TransactionBase, Iconizable
 	}
 
 	@Override
-	public String getFontColor()
+	public String getFontColor(boolean isDarkTheme)
 	{
 		final Icon icon = getIconReference();
 		if(icon == null)
 		{
-			return "#FFFFFF";
+			return getAppropriateTextColor(isDarkTheme);
 		}
 
 		final String fontColor = icon.getFontColor();
 		if(fontColor == null)
 		{
-			return "#FFFFFF";
+			return getAppropriateTextColor(isDarkTheme);
 		}
 
 		return fontColor;
 	}
 
+	private String getAppropriateTextColor(boolean isDarkTheme)
+	{
+		if(isDarkTheme)
+		{
+			return FONT_COLOR_DARK_THEME;
+		}
+
+		return FONT_COLOR_LIGHT_THEME;
+	}
+
+
 	public List<Tag> getTags()
 	{
 		return tags;

src/main/resources/templates/categories/categoriesFunctions.ftl

@@ -23,7 +23,7 @@
     </#if>
 
     <div class="category-circle ${classes} <#if settings.getShowCategoriesAsCircles()?? && settings.getShowCategoriesAsCircles() == false>category-square</#if>" style="background-color: ${category.color}" <#if datasetValue>data-value="${category.getID()}"</#if>>
-        <span style="color: ${category.getFontColor()}">
+        <span style="color: ${category.getFontColor(settings.isUseDarkTheme())}">
             <@header.entityIcon entity=category classes="category-icon" fallbackName=categoryName/>
         </span>
     </div>

src/main/resources/templates/helpers/customSelectMacros.ftl

@@ -164,7 +164,7 @@
 
 <#macro accountIcon account accountName classes="" datasetValue="">
     <div class="category-circle ${classes} category-square <#if account.getIconReference()?? && account.getIconReference().isFallbackIcon()>account-square-border</#if>" <#if datasetValue?has_content>data-value="${account.getID()}"</#if>>
-        <span style="color: ${account.getFontColor()}">
+        <span style="color: ${account.getFontColor(settings.isUseDarkTheme())}">
             <@header.entityIcon entity=account classes="account-select-icon" fallbackName=accountName/>
         </span>
     </div>

src/main/resources/templates/helpers/fontColorPicker.ftl

 <#import "../helpers/header.ftl" as header>
 
 <#macro fontColorPicker item>
-    <input type="hidden" name="fontColor" id="fontColor" value="${item.getFontColor()}">
+    <input type="hidden" name="fontColor" id="fontColor" value="${item.getFontColor(settings.isUseDarkTheme())}">
 
     <div class="row">
         <div class="input-field col s12 m12 l8 offset-l2">
@@ -12,7 +12,7 @@
                 <@header.buttonLink url='' icon='auto_fix_high' id='buttonFontColorAuto' localizationKey='account.new.icon.fontcolor.clear' noUrl=true/>
 
                 <div id="fontColorPickerContainer" class="valign-wrapper">
-                    <div id="fontColorPicker" style="background-color: ${item.getFontColor()}"></div>
+                    <div id="fontColorPicker" style="background-color: ${item.getFontColor(settings.isUseDarkTheme())}"></div>
                 </div>
             </div>
         </div>

src/main/resources/templates/helpers/iconSelect.ftl

@@ -12,7 +12,7 @@
 
             <div id="${id}" class="valign-wrapper item-icon">
                 <div class="item-icon-preview-container">
-                    <a id="item-icon-preview" style="color: <#if item.getFontColor()??>${item.getFontColor()}</#if>">
+                    <a id="item-icon-preview" style="color: <#if item.getFontColor(settings.isUseDarkTheme())??>${item.getFontColor(settings.isUseDarkTheme())}</#if>">
                         <script>iconSelectAdditionalBackgroundClasses = "${backgroundClasses}";</script>
                         <div id="item-icon-preview-background" class="category-circle category-circle-preview <#if settings.getShowCategoriesAsCircles()?? && settings.getShowCategoriesAsCircles() == false>category-square</#if> ${initialBackgroundClasses}" style="background-color: <#if showBackground>${item.getColor()}</#if>">
                             <i id="builtin-icon-preview-icon" class="<#if hasBuiltinIcon>${item.getIconReference().getBuiltinIdentifier()}<#else>hidden</#if>"></i>

src/main/resources/templates/templates/templateFunctions.ftl

@@ -98,7 +98,7 @@
 
 
 <#macro templateHeader template>
-    <span style="color: ${template.getFontColor()}">
+    <span style="color: ${template.getFontColor(settings.isUseDarkTheme())}">
         <#if template.getIconReference()?? && (template.getIconReference().isImageIcon() || template.getIconReference().isBuiltinIcon())>
             <@header.entityIcon entity=template classes="template-icon"/>
         <#elseif template.getTransferAccount()??>