Skip to content

Material Design 3: Various tasks completed #2526

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
Keboo merged 10 commits into from
Dec 16, 2021
Merged

Material Design 3: Various tasks completed #2526

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
56bbb47
Copy of MaterialDesignTheme.Defaults.xaml made
MichelMichels Dec 13, 2021
df55866
MaterialDesignTheme.Defaults replaced by MaterialDesign2.Defaults
MichelMichels Dec 13, 2021
07e55a8
Noto Sans font added
MichelMichels Dec 13, 2021
7f4b0e9
Added Typography MaterialDesign3
MichelMichels Dec 13, 2021
89d6a80
Add MaterialDesign3Demo with own namespace
MichelMichels Dec 13, 2021
c4e65be
TextBlock styles suffixed with 'TextBlock'
MichelMichels Dec 14, 2021
649aaef
Changing Material Design 3 Typography page [wip]
MichelMichels Dec 14, 2021
634b142
Revert MaterialDesign2 -> MaterialDesignTheme
MichelMichels Dec 14, 2021
c92a554
Add Typography Material Design 3 Demo
MichelMichels Dec 14, 2021
5162139
Set font to Noto for Material Design 3
MichelMichels Dec 14, 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
Prev Previous commit
Next Next commit
MaterialDesignTheme.Defaults replaced by MaterialDesign2.Defaults
  • Loading branch information
@MichelMichels
MichelMichels committed Dec 13, 2021
commit df5586689fa10c860561394ce75abc708da1dc7d
2 changes: 1 addition & 1 deletion MahMaterialDragablzMashUp/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />

<!-- Material Design -->
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign2.Defaults.xaml" />

<!-- Material Design: MahApps Compatibility -->
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Defaults.xaml"/>
Expand Down
2 changes: 1 addition & 1 deletion MainDemo.Wpf/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
-->

<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign2.Defaults.xaml" />

<ResourceDictionary Source="pack://application:,,,/ShowMeTheXAML.AvalonEdit;component/Themes/xamldisplayer.xaml" />
</ResourceDictionary.MergedDictionaries>
Expand Down
2 changes: 1 addition & 1 deletion MaterialDesignThemes.UITests/XamlTestMixins.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static async Task InitialzeWithMaterialDesign(this IApp app,
<ResourceDictionary.MergedDictionaries>
<materialDesign:BundledTheme BaseTheme=""{baseTheme}"" PrimaryColor=""{primary}"" SecondaryColor=""{secondary}"" {colorAdjustString}/>

<ResourceDictionary Source = ""pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml"" />
<ResourceDictionary Source = ""pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign2.Defaults.xaml"" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>";

Expand Down
2 changes: 1 addition & 1 deletion MaterialDesignThemes.Wpf.Tests/MdixHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ static MdixHelper()
var _ = Application.Current;
}

private static ResourceDictionary DefaultResourceDictionary => GetResourceDictionary("MaterialDesignTheme.Defaults.xaml");
private static ResourceDictionary DefaultResourceDictionary => GetResourceDictionary("MaterialDesign2.Defaults.xaml");

private static ResourceDictionary GenericResourceDictionary => GetResourceDictionary("Generic.xaml");

Expand Down
2 changes: 1 addition & 1 deletion MaterialDesignThemes.Wpf/Themes/Generic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
must be selected manually by the user, so that they override default styles.
The easiest way to do this is include:

MaterialDesignTheme.Defaults.xaml
MaterialDesign2.Defaults.xaml
in your App.xaml
-->
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Badged.xaml" />
Expand Down