Skip to content

Commit

Permalink
SeventhHeaven: Welcome the new Logo!
Browse files Browse the repository at this point in the history
Kudos to Tsuna for the designing the new theme.
Kudos to bonez and Odysseus for the logo concept art and drawing it.
  • Loading branch information
julianxhokaxhiu committed Sep 14, 2024
1 parent 3df5dfc commit 44744fa
Show file tree
Hide file tree
Showing 11 changed files with 125 additions and 9 deletions.
Binary file modified .logo/7th.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions .logo/7th.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed 7thWorkshop/7H.ico
Binary file not shown.
Binary file removed 7thWorkshop/7H.png
Binary file not shown.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
![License](https://img.shields.io/github/license/tsunamods-codes/7th-Heaven) ![Overall Downloads](https://img.shields.io/github/downloads/tsunamods-codes/7th-Heaven/total?label=Overall%20Downloads) ![Latest Stable Downloads](https://img.shields.io/github/downloads/tsunamods-codes/7th-Heaven/latest/total?label=Latest%20Stable%20Downloads&sort=semver) ![Latest Canary Downloads](https://img.shields.io/github/downloads/tsunamods-codes/7th-Heaven/canary/total?label=Latest%20Canary%20Downloads) ![GitHub Actions Workflow Status](https://github.com/tsunamods-codes/7th-Heaven/actions/workflows/main-3.9.9.yml/badge.svg?branch=master)

<div align="center">
<img src="https://github.com/tsunamods-codes/7th-Heaven/blob/master/.logo/tsunamods.png" alt="">
<br><small>7th Heaven is now officially part of the <strong>Tsunamods</strong> initiative!</small>
<img src="https://github.com/tsunamods-codes/7th-Heaven/blob/master/.logo/7th.png" alt="">
<br><small>7th Heaven is now officially part of the <a href="https://www.tsunamods.com/">Tsunamods</a> initiative!</small>
</div>

# 7th Heaven
Expand Down
Binary file modified SeventhHeavenUI/7H.ico
Binary file not shown.
98 changes: 98 additions & 0 deletions SeventhHeavenUI/Classes/Themes/SeventhHeavenTheme.cs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions SeventhHeavenUI/Classes/Themes/ThemeSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ public static ITheme GetThemeFromEnum(AppTheme appTheme)
case AppTheme.Tsunamods:
return new TsunamodsTheme();

case AppTheme.SeventhHeavenTheme:
return new SeventhHeavenTheme();

default:
return null;
}
Expand Down
13 changes: 13 additions & 0 deletions SeventhHeavenUI/Resources/SharedStyles.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,19 @@
<Color x:Key="TsunamodsControlDisabledBackground">#FFFFECDB</Color>
<Color x:Key="TsunamodsControlDisabledForeground">#FFFFECDB</Color>

<!-- COLORS - SeventhHeaven Theme -->
<Color x:Key="SeventhHeavenBackgroundColor">#FF202020</Color>
<Color x:Key="SeventhHeavenSecondaryBackgroundColor">#FF0E0E0E</Color>

<Color x:Key="SeventhHeavenControlBackground">#FF2F3B41</Color>
<Color x:Key="SeventhHeavenControlForeground">#FFFFFFFF</Color>
<Color x:Key="SeventhHeavenControlSecondary">#FF808080</Color>
<Color x:Key="SeventhHeavenControlPressed">#FF477086</Color>
<Color x:Key="SeventhHeavenControlMouseOver">#FF5E5E5E</Color>

<Color x:Key="SeventhHeavenControlDisabledBackground">#FF202020</Color>
<Color x:Key="SeventhHeavenControlDisabledForeground">#FFFFFFFF</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>
<Color x:Key="PrimaryControlPressedColor">#CF2D2A</Color>
Expand Down
13 changes: 7 additions & 6 deletions SeventhHeavenUI/ViewModels/ThemeSettingsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ public Dictionary<string, AppTheme> DropDownOptionEnums
{
return new Dictionary<string, AppTheme>
{
{ "7thHeaven", AppTheme.SeventhHeavenTheme },
{ "Tsunamods", AppTheme.Tsunamods },
{ "Dark Mode", AppTheme.DarkMode },
{ "Dark Mode w/ Background", AppTheme.DarkModeWithBackground },
Expand Down Expand Up @@ -342,7 +343,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.Tsunamods);
new ThemeSettingsViewModel(loadThemeXml: false).ApplyBuiltInTheme(AppTheme.SeventhHeavenTheme);
return;
}

Expand All @@ -358,7 +359,7 @@ internal static ITheme GetThemeSettingsFromFile()

if (!File.Exists(pathToThemeFile))
{
return ThemeSettings.GetThemeFromEnum(AppTheme.Tsunamods);
return ThemeSettings.GetThemeFromEnum(AppTheme.SeventhHeavenTheme);
}

try
Expand All @@ -369,7 +370,7 @@ internal static ITheme GetThemeSettingsFromFile()
catch (Exception e)
{
Logger.Error(e);
return ThemeSettings.GetThemeFromEnum(AppTheme.Tsunamods);
return ThemeSettings.GetThemeFromEnum(AppTheme.SeventhHeavenTheme);
}
}

Expand Down Expand Up @@ -416,7 +417,7 @@ internal static string GetSavedThemeName()
if (!File.Exists(pathToThemeFile))
{
Logger.Warn("theme.xml does not exist");
return "Tsunamods";
return "7thHeaven";
}

ThemeSettings savedTheme = Util.Deserialize<ThemeSettings>(pathToThemeFile);
Expand All @@ -427,7 +428,7 @@ internal static string GetSavedThemeName()
Logger.Warn(e);
}

return "Tsunamods";
return "7thHeaven";
}

/// <summary>
Expand Down Expand Up @@ -642,7 +643,7 @@ private void InitColorTextInput()

if (!File.Exists(pathToThemeFile))
{
savedTheme = ThemeSettings.GetThemeFromEnum(AppTheme.Tsunamods) as ThemeSettings;
savedTheme = ThemeSettings.GetThemeFromEnum(AppTheme.SeventhHeavenTheme) as ThemeSettings;
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion SeventhHeavenUI/Windows/ThemeSettingsWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<DataTemplate x:Key="selectedThemeTemplate">
<Grid x:Name="gd" DataContext="{Binding ElementName=windowTheme, Path=DataContext}" Background="Transparent">
<TextBlock Text="{Binding ElementName=gd, Path=DataContext.SelectedThemeText, FallbackValue='Tsunamods'}" Margin="0,0,15,0" TextTrimming="CharacterEllipsis"/>
<TextBlock Text="{Binding ElementName=gd, Path=DataContext.SelectedThemeText, FallbackValue='7thHeaven'}" Margin="0,0,15,0" TextTrimming="CharacterEllipsis"/>
</Grid>
</DataTemplate>

Expand Down

0 comments on commit 44744fa

Please sign in to comment.