Skip to content

Added support for custom themes #3890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 8, 2021
Merged

Added support for custom themes #3890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
93f8539
Added support for getting external theme through resource dictionary
winston-de Mar 4, 2021
0836298
Moved from static class to instance
winston-de Mar 4, 2021
945b666
Added theme selector
winston-de Mar 8, 2021
ad1807d
Merge from upstream/main
winston-de Mar 8, 2021
ff2f079
hide theme selector when no themes are present
winston-de Mar 8, 2021
a1312d0
Added strings to resources
winston-de Mar 8, 2021
a64ae2b
Fixed issue where theme was not respected in properties dialog
winston-de Mar 8, 2021
2392bda
Update Files/Views/SettingsPages/Appearance.xaml
winston-de Mar 8, 2021
ac1816d
Update Files/Views/SettingsPages/Appearance.xaml
winston-de Mar 8, 2021
31906aa
Merge from upstream
winston-de Mar 8, 2021
e763c7f
Made requested changes
winston-de Mar 8, 2021
17cde41
Added docs
winston-de Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Files/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ sealed partial class App : Application
public static DrivesManager DrivesManager { get; private set; }
public static WSLDistroManager WSLDistroManager { get; private set; }
public static LibraryManager LibraryManager { get; private set; }
public static ExternalResourcesHelper ExternalResourcesHelper { get; private set; }

private static readonly Logger Logger = LogManager.GetCurrentClassLogger();

Expand Down Expand Up @@ -89,6 +90,9 @@ private static async Task EnsureSettingsAndConfigurationAreBootstrapped()
AppSettings = await SettingsViewModel.CreateInstance();
}

ExternalResourcesHelper ??= new ExternalResourcesHelper();
await ExternalResourcesHelper.LoadSelectedTheme();

InteractionViewModel ??= new InteractionViewModel();
SidebarPinnedController ??= await SidebarPinnedController.CreateInstance();
LibraryManager ??= new LibraryManager();
Expand Down
1 change: 1 addition & 0 deletions Files/Files.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@
<Compile Include="Dialogs\RestartDialog.xaml.cs">
<DependentUpon>RestartDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Helpers\ExternalResourcesHelper.cs" />
<Compile Include="Helpers\GlyphHelper.cs" />
<Compile Include="Helpers\FileThumbnailHelper.cs" />
<Compile Include="Helpers\MenuFlyoutHelper.cs" />
Expand Down
78 changes: 78 additions & 0 deletions Files/Helpers/ExternalResourcesHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
using Microsoft.Toolkit.Uwp.Extensions;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Windows.Storage;
using Windows.UI.Core;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Markup;

namespace Files.Helpers
{
public class ExternalResourcesHelper
{

public List<string> Themes = new List<string>()
{
"DefaultScheme".GetLocalized()
};

private StorageFolder ThemeFolder { get; set; }

public string CurrentThemeResources { get; set; }

public async Task LoadSelectedTheme()
{
ThemeFolder = (await ApplicationData.Current.LocalFolder.TryGetItemAsync("Themes")) as StorageFolder;
ThemeFolder ??= await ApplicationData.Current.LocalFolder.CreateFolderAsync("Themes");

if (App.AppSettings.PathToThemeFile != "DefaultScheme".GetLocalized())
{
await TryLoadThemeAsync(App.AppSettings.PathToThemeFile);
}

LoadOtherThemesAsync();
}

private async void LoadOtherThemesAsync()
{
try
{
foreach (var file in (await ThemeFolder.GetFilesAsync()).Where(x => x.FileType == ".xaml"))
{
Themes.Add(file.Name);
}
}
catch (Exception)
{
Debug.WriteLine($"Error loading themes");
}
}

public async Task<bool> TryLoadThemeAsync(string name)
{
try
{
var file = await ThemeFolder.GetFileAsync(name);
CurrentThemeResources = await FileIO.ReadTextAsync(file);
var xaml = XamlReader.Load(CurrentThemeResources) as ResourceDictionary;
App.Current.Resources.MergedDictionaries.Add(xaml);

return true;
}
catch (Exception)
{
return false;
}
}

public struct AppTheme
{
public ResourceDictionary ResourceDictionary { get; set; }
public string Name { get; set; }
}
}
}
1 change: 1 addition & 0 deletions Files/Interacts/Interaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,7 @@ await newWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
Window.Current.Close();
};
});

bool viewShown = await ApplicationViewSwitcher.TryShowAsStandaloneAsync(newView.Id);
// Set window size again here as sometimes it's not resized in the page Loaded event
newView.TryResizeView(new Size(400, 550));
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.ar.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2394,6 +2394,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.cs-CZ.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2414,6 +2414,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.da-DK.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2394,6 +2394,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.da.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2394,6 +2394,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.de-DE.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2396,6 +2396,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.es-ES.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2394,6 +2394,14 @@
<source>Open in new Pane</source>
<target state="translated">Abrir en nuevo Panel</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.fr-FR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2398,6 +2398,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.he-IL.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2396,6 +2396,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.hi-IN.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2407,6 +2407,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.hu-HU.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2394,6 +2394,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.it-IT.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2394,6 +2394,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.ja-JP.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2394,6 +2394,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.ko-KR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2395,6 +2395,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.nl-NL.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2409,6 +2409,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.or-IN.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2407,6 +2407,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.pl-PL.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2400,6 +2400,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2397,6 +2397,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.ru-RU.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2394,6 +2394,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.sv-SE.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2394,6 +2394,14 @@
<source>Open in new Pane</source>
<target state="new">Open in new Pane</target>
</trans-unit>
<trans-unit id="DefaultScheme" translate="yes" xml:space="preserve">
<source>Default</source>
<target state="new">Default</target>
</trans-unit>
<trans-unit id="SettingsAppearanceColorScheme.Header" translate="yes" xml:space="preserve">
<source>Color scheme</source>
<target state="new">Color scheme</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
Loading