github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-23 06:25:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Android] Add Calc font

Browse source 
- Align FontFamily syntax
This commit is contained in:
David Oliver 2019-05-23 14:47:16 -04:00 • committed by Jérôme Laban
commit 7c9974a453
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
src/Calculator.Droid/Assets/CalcMDL2.ttf Normal file
View file

Binary file not shown.

1
src/Calculator.Droid/Calculator.Droid.csproj
View file

@ -68,6 +68,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AndroidAsset Include="Assets\Fonts\winjs-symbols.ttf" /> <AndroidAsset Include="Assets\Fonts\winjs-symbols.ttf" />
<AndroidAsset Include="Assets\CalcMDL2.ttf" />
<None Include="Resources\AboutResources.txt" /> <None Include="Resources\AboutResources.txt" />
<None Include="Assets\AboutAssets.txt" /> <None Include="Assets\AboutAssets.txt" />
</ItemGroup> </ItemGroup>

5
src/Calculator.Shared/Styles.xaml
View file

@ -272,10 +272,9 @@
<x:Double x:Key="AppMinWindowHeight">500</x:Double> <x:Double x:Key="AppMinWindowHeight">500</x:Double>
<x:Double x:Key="AppMinWindowWidth">320</x:Double> <x:Double x:Key="AppMinWindowWidth">320</x:Double>
<win:FontFamily x:Key="CalculatorFontFamily">ms-appx:///Assets/CalcMDL2.ttf#Calculator MDL2 Assets</win:FontFamily> <FontFamily x:Key="CalculatorFontFamily">ms-appx:///Assets/CalcMDL2.ttf#Calculator MDL2 Assets</FontFamily>
<xamarin:FontFamily x:Key="CalculatorFontFamily">Calculator MDL2 Assets</xamarin:FontFamily>
<x:Double x:Key="SplitViewOpenPaneLength">256</x:Double> <x:Double x:Key="SplitViewOpenPaneLength">256</x:Double>
<Thickness x:Key="PivotPortraitThemePadding">0,1,0,0</Thickness> <Thickness x:Key="PivotPortraitThemePadding">0,1,0,0</Thickness>
<x:Double x:Key="PivotHeaderItemFontSize">15</x:Double> <x:Double x:Key="PivotHeaderItemFontSize">15</x:Double>
<FontWeight x:Key="PivotHeaderItemThemeFontWeight">SemiBold</FontWeight> <FontWeight x:Key="PivotHeaderItemThemeFontWeight">SemiBold</FontWeight>