Add the new Tsunamods Theme and use it as fallback default

tsunamods-codes · Feb 28, 2022 · ea7a609 · ea7a609
1 parent 59a5e8a
commit ea7a609
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 6 deletions.
diff --git a/SeventhHeavenUI/Classes/Themes/ITheme.cs b/SeventhHeavenUI/Classes/Themes/ITheme.cs
@@ -14,6 +14,7 @@ public enum AppTheme
         LightMode,
         LightModeWithBackground,
         Classic7H,
+        Tsunamods
     }
 
     public interface ITheme

diff --git a/SeventhHeavenUI/Classes/Themes/ThemeSettings.cs b/SeventhHeavenUI/Classes/Themes/ThemeSettings.cs
@@ -50,6 +50,9 @@ public static ITheme GetThemeFromEnum(AppTheme appTheme)
                 case AppTheme.Custom:
                     return new ThemeSettings();
 
+                case AppTheme.Tsunamods:
+                    return new TsunamodsTheme();
+
                 default:
                     return null;
             }

diff --git a/SeventhHeavenUI/Classes/Themes/TsunamodsTheme.cs b/SeventhHeavenUI/Classes/Themes/TsunamodsTheme.cs
diff --git a/SeventhHeavenUI/Resources/SharedStyles.xaml b/SeventhHeavenUI/Resources/SharedStyles.xaml
@@ -43,8 +43,18 @@
 
     <Color x:Key="ClassicControlDisabledBackground">#FF696969</Color>
     <Color x:Key="ClassicControlDisabledForeground">#FFCADCD3</Color>
-
-
+
+    <!-- COLORS - Tsunamods Theme -->
+    <Color x:Key="TsunamodsBackgroundColor">#FF181818</Color>
+    <Color x:Key="TsunamodsSecondaryBackgroundColor">#FF0C0C0C</Color>
+
+    <Color x:Key="TsunamodsControlBackground">#FF333333</Color>
+    <Color x:Key="TsunamodsControlForeground">#FFFFECDB</Color>
+    <Color x:Key="TsunamodsControlPressed">#FF78A7AF</Color>
+    <Color x:Key="TsunamodsControlMouseOver">#FF78A7AF</Color>
+
+    <Color x:Key="TsunamodsControlDisabledBackground">#FFFFECDB</Color>
+    <Color x:Key="TsunamodsControlDisabledForeground">#FFFFECDB</Color>
 
     <!-- APP BRUSHES - These are used in all the below styles to have a consistent color theme across all controls. The color of these brushes can be changed in the "Color Theme" settings of the app -->
     <Color x:Key="PrimaryControlMouseOverColor">#5e5e5e</Color>

diff --git a/SeventhHeavenUI/SeventhHeavenUI.csproj b/SeventhHeavenUI/SeventhHeavenUI.csproj
@@ -150,6 +150,7 @@
     <Compile Include="Classes\Themes\DarkTheme.cs" />
     <Compile Include="Classes\Themes\ITheme.cs" />
     <Compile Include="Classes\Themes\ThemeSettings.cs" />
+    <Compile Include="Classes\Themes\TsunamodsTheme.cs" />
     <Compile Include="Classes\UpdateChecker.cs" />
     <Compile Include="Classes\GameDiscMounter.cs" />
     <Compile Include="Classes\WCF\ServiceHost.cs" />

diff --git a/SeventhHeavenUI/ViewModels/ThemeSettingsViewModel.cs b/SeventhHeavenUI/ViewModels/ThemeSettingsViewModel.cs
@@ -213,6 +213,7 @@ public Dictionary<string, AppTheme> DropDownOptionEnums
             {
                 return new Dictionary<string, AppTheme>
                 {
+                    { "Tsunamods", AppTheme.Tsunamods },
                     { "Dark Mode", AppTheme.DarkMode },
                     { "Dark Mode w/ Background", AppTheme.DarkModeWithBackground },
                     { "Light Mode", AppTheme.LightMode },
@@ -249,7 +250,7 @@ internal static void LoadThemeFromFile()
             // dark theme w/ background will be applied as the default when theme.xml file does not exist
             if (!File.Exists(pathToThemeFile))
             {
-                new ThemeSettingsViewModel(loadThemeXml: false).ApplyBuiltInTheme(AppTheme.DarkModeWithBackground);
+                new ThemeSettingsViewModel(loadThemeXml: false).ApplyBuiltInTheme(AppTheme.Tsunamods);
                 return;
             }
 
@@ -265,7 +266,7 @@ internal static ITheme GetThemeSettingsFromFile()
 
             if (!File.Exists(pathToThemeFile))
             {
-                return ThemeSettings.GetThemeFromEnum(AppTheme.DarkModeWithBackground);
+                return ThemeSettings.GetThemeFromEnum(AppTheme.Tsunamods);
             }
 
             try
@@ -276,7 +277,7 @@ internal static ITheme GetThemeSettingsFromFile()
             catch (Exception e)
             {
                 Logger.Error(e);
-                return ThemeSettings.GetThemeFromEnum(AppTheme.DarkModeWithBackground);
+                return ThemeSettings.GetThemeFromEnum(AppTheme.Tsunamods);
             }
         }
 
@@ -533,7 +534,7 @@ private void InitColorTextInput()
 
                 if (!File.Exists(pathToThemeFile))
                 {
-                    savedTheme = ThemeSettings.GetThemeFromEnum(AppTheme.DarkModeWithBackground) as ThemeSettings;
+                    savedTheme = ThemeSettings.GetThemeFromEnum(AppTheme.Tsunamods) as ThemeSettings;
                 }
                 else
                 {