Skip to content

Commit

Permalink
Fix startup so styles are correctly used
Browse files Browse the repository at this point in the history
  • Loading branch information
@softlion
softlion committed Sep 20, 2020
1 parent 9f77551 commit cd7f42d
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 45 deletions.
6 changes: 4 additions & 2 deletions Samples/MaterialMvvmSample/App.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
xmlns:ui="clr-namespace:XF.Material.Forms.UI;assembly=XF.Material">
<Application.Resources>

<!-- Breaks hot reload -->
<OnPlatform x:Key="FontFamily.Exo2Regular"
x:TypeArguments="x:String"
Android="Fonts/Exo2-Regular.ttf#Exo2-Regular"
Expand Down Expand Up @@ -56,11 +57,12 @@
OnPrimary="#FFFFFF"
OnSecondary="#FFFFFF"
OnSurface="#000000"
Primary="#6200EE"
PrimaryVariant="#6200EE"
Primary="#6250EE"
PrimaryVariant="#6280EE"
Secondary="#00377b"
Surface="#FFFFFF" />

<!-- Does not support DynamicResource (why?) -->
<mtrl:MaterialConfiguration x:Key="Material.Style"
ColorConfiguration="{StaticResource Material.Color}"
FontConfiguration="{StaticResource Material.Font}" />
Expand Down
2 changes: 0 additions & 2 deletions Samples/MaterialMvvmSample/App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ public App(INavigationService navigationService)
InitializeComponent();
XF.Material.Forms.Material.Use("Material.Style");

XamSvg.Shared.Config.ResourceAssembly = typeof(App).Assembly;

navigationService.SetRootView(ViewNames.LandingView);
}

Expand Down
100 changes: 59 additions & 41 deletions XF.Material/Material.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,32 @@ namespace XF.Material.Forms
public class Material
{
private static readonly Lazy<IMaterialUtility> MaterialUtilityInstance = new Lazy<IMaterialUtility>(() => DependencyService.Get<IMaterialUtility>());
private MaterialConfiguration _config;
private static ResourceDictionary _res;

private static Material Instance;

internal Material(Application app, MaterialConfiguration materialResource) : this(app)
{
_config = materialResource;
Instance = this;
}

internal Material(Application app, string key) : this(app)
{
_config = GetResource<MaterialConfiguration>(key);
Instance = this;
}
private ResourceDictionary _res;

internal Material(Application app)
internal Material(Application app, MaterialConfiguration config = null)
{
_res = app.Resources;
_config = new MaterialConfiguration
{
ColorConfiguration = new MaterialColorConfiguration(),
FontConfiguration = new MaterialFontConfiguration()
};
Instance = this;
MergeMaterialDictionaries(config, config == null);
}

// internal Material(Application app, string key) : this(app)
// {
// _res = app.Resources;
// Instance = this;
// var config = GetResource<MaterialConfiguration>(key);
// MergeMaterialDictionaries(config, config == null);
// }

public static void Use(string key)
{
if (Instance == null)
Init(Application.Current);
// ReSharper disable once PossibleNullReferenceException
Instance._config = GetResource<MaterialConfiguration>(key);
//Replace instance
//new Material(Application.Current, GetResource<MaterialConfiguration>(key));
var config = GetResource<MaterialConfiguration>(key);
if(config != null)
Instance.MergeMaterialDictionaries(config, false);
}

/// <summary>
Expand All @@ -62,20 +54,15 @@ public static void Use(string key)
/// <exception cref="ArgumentNullException" />
public static T GetResource<T>(string key)
{
if(_res == null)
if(Instance._res == null)
throw new Exception("You must call one of the Init() methods in App.xaml.cs before InitializeComponent()");

_res.TryGetValue(key ?? throw new ArgumentNullException(nameof(key)), out var value);

if (value is T resource)
{
if (Instance._res.TryGetValue(key ?? throw new ArgumentNullException(nameof(key)), out var value)
&& value is T resource)
return resource;
}

if (value != null)
{
throw new InvalidCastException($"The resource retrieved was not of the type {typeof(T)}. Use {value.GetType()} instead.");
}

return default;
}
Expand All @@ -88,8 +75,7 @@ public static T GetResource<T>(string key)
/// <exception cref="ArgumentNullException" />
public static void Init(Application app, MaterialConfiguration materialResource)
{
var material = new Material(app ?? throw new ArgumentNullException(nameof(app)), materialResource ?? throw new ArgumentNullException(nameof(materialResource)));
material.MergeMaterialDictionaries();
new Material(app ?? throw new ArgumentNullException(nameof(app)), materialResource ?? throw new ArgumentNullException(nameof(materialResource)));
}

///// <summary>
Expand All @@ -111,15 +97,47 @@ public static void Init(Application app, MaterialConfiguration materialResource)
/// <exception cref="ArgumentNullException" />
public static void Init(Application app)
{
var material = new Material(app ?? throw new ArgumentNullException(nameof(app)));
material.MergeMaterialDictionaries();
new Material(app ?? throw new ArgumentNullException(nameof(app)));
}

private void MergeMaterialDictionaries()
Lazy<MaterialColors> defaultColors = new Lazy<MaterialColors>(() => new MaterialColors(new MaterialColorConfiguration()));
Lazy<MaterialTypography> defaultTypos = new Lazy<MaterialTypography>(() => new MaterialTypography(new MaterialFontConfiguration()));
Lazy<MaterialSizes> defaultSizes = new Lazy<MaterialSizes>(() => new MaterialSizes());

private void MergeMaterialDictionaries(MaterialConfiguration config, bool addDefaults)
{
_res.MergedDictionaries.Add(new MaterialColors(_config.ColorConfiguration ?? new MaterialColorConfiguration()));
_res.MergedDictionaries.Add(new MaterialTypography(_config.FontConfiguration ?? new MaterialFontConfiguration()));
_res.MergedDictionaries.Add(new MaterialSizes());
if(config != null)
{
if (config.ColorConfiguration != null)
{
_res.MergedDictionaries.Remove(defaultColors.Value);
_res.MergedDictionaries.Add(new MaterialColors(config.ColorConfiguration));
}
else if(addDefaults &&!_res.MergedDictionaries.Contains((defaultColors.Value)))
_res.MergedDictionaries.Add(defaultColors.Value);

if (config.FontConfiguration != null)
{
_res.MergedDictionaries.Remove(defaultTypos.Value);
_res.MergedDictionaries.Add(new MaterialTypography(config.FontConfiguration));
}
else if(addDefaults &&!_res.MergedDictionaries.Contains((defaultTypos.Value)))
_res.MergedDictionaries.Add(defaultTypos.Value);
}

if (addDefaults)
{
if (config == null)
{
if(!_res.MergedDictionaries.Contains((defaultColors.Value)))
_res.MergedDictionaries.Add(defaultColors.Value);
if(!_res.MergedDictionaries.Contains((defaultTypos.Value)))
_res.MergedDictionaries.Add(defaultTypos.Value);
}

if(!_res.MergedDictionaries.Contains((defaultSizes.Value)))
_res.MergedDictionaries.Add(defaultSizes.Value);
}
}

/// <summary>
Expand Down Expand Up @@ -201,7 +219,7 @@ private static Xamarin.Forms.Color GetSecondaryColor()
/// <summary>
/// Static class that contains the current Material font family values.
/// </summary>
public static class FontFamily
public static class FontFamily
{
/// <summary>
/// Body 1 font family, used for long-form writing and small text sizes.
Expand Down

0 comments on commit cd7f42d

Please sign in to comment.