Browse Source

Rename Avalonia.Themes.Fluent.Inter to Avalonia.Fonts.Inter

pull/10293/head
Max Katz 3 years ago
parent
commit
c01edba86e
  1. 15
      Avalonia.sln
  2. 2
      samples/ControlCatalog/ControlCatalog.csproj
  3. 0
      src/Avalonia.Fonts.Inter/Assets/Inter-Bold.otf
  4. 0
      src/Avalonia.Fonts.Inter/Assets/Inter-ExtraLight.otf
  5. 0
      src/Avalonia.Fonts.Inter/Assets/Inter-Light.otf
  6. 0
      src/Avalonia.Fonts.Inter/Assets/Inter-Medium.otf
  7. 0
      src/Avalonia.Fonts.Inter/Assets/Inter-Regular.otf
  8. 0
      src/Avalonia.Fonts.Inter/Assets/Inter-SemiBold.otf
  9. 0
      src/Avalonia.Fonts.Inter/Assets/Inter-Thin.otf
  10. 1
      src/Avalonia.Fonts.Inter/Avalonia.Fonts.Inter.csproj
  11. 2
      src/Avalonia.Fonts.Inter/Properties/AssemblyInfo.cs
  12. 2
      src/Avalonia.Themes.Fluent/Accents/Base.xaml

15
Avalonia.sln

@ -237,7 +237,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.ItemsRepe
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.ItemsRepeater.UnitTests", "tests\Avalonia.Controls.ItemsRepeater.UnitTests\Avalonia.Controls.ItemsRepeater.UnitTests.csproj", "{F4E36AA8-814E-4704-BC07-291F70F45193}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Fluent.Inter", "src\Avalonia.Themes.Fluent.Inter\Avalonia.Themes.Fluent.Inter.csproj", "{5E19C5EF-19D7-4E70-9050-48DAE7FF5FA4}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Themes", "Themes", "{5D6AECCA-3700-4F9A-8A52-5DD56CA41CDC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Fonts.Inter", "src\Avalonia.Fonts.Inter\Avalonia.Fonts.Inter.csproj", "{13F1135D-BA1A-435C-9C5B-A368D1D63DE4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -562,10 +564,10 @@ Global
{F4E36AA8-814E-4704-BC07-291F70F45193}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F4E36AA8-814E-4704-BC07-291F70F45193}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F4E36AA8-814E-4704-BC07-291F70F45193}.Release|Any CPU.Build.0 = Release|Any CPU
{5E19C5EF-19D7-4E70-9050-48DAE7FF5FA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E19C5EF-19D7-4E70-9050-48DAE7FF5FA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E19C5EF-19D7-4E70-9050-48DAE7FF5FA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E19C5EF-19D7-4E70-9050-48DAE7FF5FA4}.Release|Any CPU.Build.0 = Release|Any CPU
{13F1135D-BA1A-435C-9C5B-A368D1D63DE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{13F1135D-BA1A-435C-9C5B-A368D1D63DE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{13F1135D-BA1A-435C-9C5B-A368D1D63DE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{13F1135D-BA1A-435C-9C5B-A368D1D63DE4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -632,6 +634,9 @@ Global
{75C47156-C5D8-44BC-A5A7-E8657C2248D6} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{C810060E-3809-4B74-A125-F11533AF9C1B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{F4E36AA8-814E-4704-BC07-291F70F45193} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC} = {5D6AECCA-3700-4F9A-8A52-5DD56CA41CDC}
{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F} = {5D6AECCA-3700-4F9A-8A52-5DD56CA41CDC}
{13F1135D-BA1A-435C-9C5B-A368D1D63DE4} = {5D6AECCA-3700-4F9A-8A52-5DD56CA41CDC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}

2
samples/ControlCatalog/ControlCatalog.csproj

@ -29,7 +29,7 @@
<ProjectReference Include="..\..\src\Avalonia.Controls.ItemsRepeater\Avalonia.Controls.ItemsRepeater.csproj" />
<ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
<ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
<ProjectReference Include="..\..\src\Avalonia.Themes.Fluent.Inter\Avalonia.Themes.Fluent.Inter.csproj" />
<ProjectReference Include="..\..\src\Avalonia.Fonts.Inter\Avalonia.Fonts.Inter.csproj" />
<ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
<ProjectReference Include="..\SampleControls\ControlSamples.csproj" />
</ItemGroup>

0
src/Avalonia.Themes.Fluent.Inter/Assets/Inter-Bold.otf → src/Avalonia.Fonts.Inter/Assets/Inter-Bold.otf

0
src/Avalonia.Themes.Fluent.Inter/Assets/Inter-ExtraLight.otf → src/Avalonia.Fonts.Inter/Assets/Inter-ExtraLight.otf

0
src/Avalonia.Themes.Fluent.Inter/Assets/Inter-Light.otf → src/Avalonia.Fonts.Inter/Assets/Inter-Light.otf

0
src/Avalonia.Themes.Fluent.Inter/Assets/Inter-Medium.otf → src/Avalonia.Fonts.Inter/Assets/Inter-Medium.otf

0
src/Avalonia.Themes.Fluent.Inter/Assets/Inter-Regular.otf → src/Avalonia.Fonts.Inter/Assets/Inter-Regular.otf

0
src/Avalonia.Themes.Fluent.Inter/Assets/Inter-SemiBold.otf → src/Avalonia.Fonts.Inter/Assets/Inter-SemiBold.otf

0
src/Avalonia.Themes.Fluent.Inter/Assets/Inter-Thin.otf → src/Avalonia.Fonts.Inter/Assets/Inter-Thin.otf

1
src/Avalonia.Themes.Fluent.Inter/Avalonia.Themes.Fluent.Inter.csproj → src/Avalonia.Fonts.Inter/Avalonia.Fonts.Inter.csproj

@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
<PackageId>Avalonia.Fonts.Inter</PackageId>
</PropertyGroup>
<ItemGroup>
<AvaloniaResource Include="Assets\*" />

2
src/Avalonia.Themes.Fluent.Inter/Properties/AssemblyInfo.cs → src/Avalonia.Fonts.Inter/Properties/AssemblyInfo.cs

@ -1,3 +1,3 @@
using Avalonia.Metadata;
[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Themes.Fluent.Inter")]
[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Fonts.Inter")]

2
src/Avalonia.Themes.Fluent/Accents/Base.xaml

@ -3,7 +3,7 @@
xmlns:sys="using:System"
xmlns:converters="using:Avalonia.Controls.Converters">
<!-- https://docs.microsoft.com/en-us/previous-versions/windows/apps/dn518235(v=win.10)?redirectedfrom=MSDN -->
<FontFamily x:Key="ContentControlThemeFontFamily">avares://Avalonia.Themes.Fluent.Inter/Assets#Inter, $Default</FontFamily>
<FontFamily x:Key="ContentControlThemeFontFamily">avares://Avalonia.Fonts.Inter/Assets#Inter, $Default</FontFamily>
<sys:Double x:Key="ControlContentThemeFontSize">14</sys:Double>
<SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />

Loading…
Cancel
Save