5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-12-23 02:23:22 +00:00
Code Issues Projects Releases Wiki Activity

Relooking + liens

Browse source
This commit is contained in:
Yan Maniez 2018-07-05 10:16:16 +02:00
parent f3d410d6c7
commit 0d8dfe8780
5 changed files with 144 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

42
AideDeJeu/AideDeJeu/App.xaml
View file

@ -83,6 +83,24 @@
<On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/LinLibertine_R.ttf#Linux Libertine" />
</OnPlatform>
<OnPlatform x:Key="LinuxLibertineCapitalsBold" x:TypeArguments="x:String">
<On Platform="iOS" Value="Linux Libertine Capitals" />
<On Platform="Android" Value="LinLibertine_aBS.ttf#Linux Libertine Capitals" />
<On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/LinLibertine_R.ttf#Linux Libertine" />
</OnPlatform>
<OnPlatform x:Key="LinuxLibertineCapitalsItal" x:TypeArguments="x:String">
<On Platform="iOS" Value="Linux Libertine Capitals" />
<On Platform="Android" Value="LinLibertine_aSI.ttf#Linux Libertine Capitals" />
<On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/LinLibertine_R.ttf#Linux Libertine" />
</OnPlatform>
<OnPlatform x:Key="LinuxLibertineCapitalsBoldItal" x:TypeArguments="x:String">
<On Platform="iOS" Value="Linux Libertine Capitals" />
<On Platform="Android" Value="LinLibertine_aSZI.ttf#Linux Libertine Capitals" />
<On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/LinLibertine_R.ttf#Linux Libertine" />
</OnPlatform>
<OnPlatform x:Key="LinuxLibertine" x:TypeArguments="x:String">
<On Platform="iOS" Value="Linux Libertine" />
<On Platform="Android" Value="LinLibertine_R.ttf#Linux Libertine" />
@ -153,6 +171,30 @@
<Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineBoldItal}" />
</Style>
<Style TargetType="Label" x:Key="paragraph">
<Setter Property="FontSize" Value="14" />
<Setter Property="TextColor" Value="{StaticResource titlered}" />
<Setter Property="FontFamily" Value="serif" />
</Style>
<Style TargetType="Label" x:Key="heading1">
<Setter Property="FontSize" Value="26" />
<Setter Property="TextColor" Value="{StaticResource titlered}" />
<Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitalsBold}" />
</Style>
<Style TargetType="Label" x:Key="heading2">
<Setter Property="FontSize" Value="22" />
<Setter Property="TextColor" Value="{StaticResource titlered}" />
<Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitalsBold}" />
</Style>
<Style TargetType="Label" x:Key="heading3">
<Setter Property="FontSize" Value="20" />
<Setter Property="TextColor" Value="{StaticResource titlered}" />
<Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitalsBold}" />
</Style>
<Style TargetType="NavigationPage">
<Setter Property="BarBackgroundColor" Value="{StaticResource titlered}" />
<Setter Property="BarTextColor" Value="{StaticResource bgtan}" />

10
AideDeJeu/AideDeJeu/MarkdownView/MarkdownTheme.cs
View file

@ -86,6 +86,14 @@ namespace Xam.Forms.Markdown
BackgroundColor = Color.Silver,
};
this.TableCell = new MarkdownStyle
{
Attributes = FontAttributes.None,
FontSize = 14,
BorderSize = 1,
BackgroundColor = Color.White,
};
// Platform specific properties
switch (Device.RuntimePlatform)
{
@ -125,6 +133,8 @@ namespace Xam.Forms.Markdown
public MarkdownStyle TableHeader { get; set; }
public MarkdownStyle TableCell { get; set; }
public float Margin { get; set; } = 10;
}

2
AideDeJeu/AideDeJeu/MarkdownView/MarkdownView.cs
View file

@ -408,7 +408,7 @@
foreach (var blockpar in cell)
{
var par = blockpar as Markdig.Syntax.ParagraphBlock;
var style = row.IsHeader ? Theme.TableHeader : Theme.Paragraph;
var style = row.IsHeader ? Theme.TableHeader : Theme.TableCell;
var frame = new Frame
{
BackgroundColor = style.BackgroundColor,

16
AideDeJeu/AideDeJeu/Tools/MarkdownThemes.cs
View file

@ -10,22 +10,28 @@ namespace AideDeJeu.Tools
public MonsterMarkdownTheme()
{
//this.Margin = 0;
var fd = FormatedTextHelpers.FontData.FromResource("content");
var fdParagraph = FormatedTextHelpers.FontData.FromResource("paragraph");
var fdHeading1 = FormatedTextHelpers.FontData.FromResource("heading1");
var fdHeading2 = FormatedTextHelpers.FontData.FromResource("heading2");
var fdHeading3 = FormatedTextHelpers.FontData.FromResource("heading3");
//this.Paragraph.FontFamily = fd.FontFamily;
//this.Paragraph.FontFamily = "Droid Serif";
this.Paragraph.FontFamily = "serif";
this.Paragraph.FontSize = (float)fd.FontSize;
this.Paragraph.Attributes = fd.FontAttributes;
this.Paragraph.ForegroundColor = fd.TextColor;
this.Paragraph.FontFamily = fdParagraph.FontFamily;
this.Paragraph.FontSize = (float)fdParagraph.FontSize;
this.Paragraph.Attributes = fdParagraph.FontAttributes;
this.Paragraph.ForegroundColor = fdParagraph.TextColor;
this.Paragraph.BackgroundColor = DefaultBackgroundColor;
this.BackgroundColor = DefaultBackgroundColor;
//this.Paragraph.ForegroundColor = DefaultTextColor;
this.Heading1.ForegroundColor = DefaultTextColor;
this.Heading1.BorderColor = DefaultSeparatorColor;
this.Heading1.FontFamily = fdHeading1.FontFamily;
this.Heading2.ForegroundColor = DefaultTextColor;
this.Heading2.BorderColor = DefaultSeparatorColor;
this.Heading2.FontFamily = fdHeading2.FontFamily;
this.Heading3.ForegroundColor = DefaultTextColor;
this.Heading3.FontFamily = fdHeading3.FontFamily;
this.Heading4.ForegroundColor = DefaultTextColor;
this.Heading5.ForegroundColor = DefaultTextColor;
this.Heading6.ForegroundColor = DefaultTextColor;