5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-31 07:26:09 +00:00
Code Issues Projects Releases Wiki Activity

Styles

Browse source
This commit is contained in:
Yan Maniez 2018-09-16 16:09:52 +02:00
parent 985dbfabb9
commit cd3e556837
4 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
AideDeJeu/AideDeJeu/App.xaml
View file

@ -246,6 +246,14 @@
<Setter Property="FontFamily" Value="{DynamicResource LinuxLibertine}" /> <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertine}" />
</Style> </Style>
<Style TargetType="Label" x:Key="tablecellalt">
<Setter Property="FontSize" Value="14" />
<Setter Property="Margin" Value="1" />
<Setter Property="TextColor" Value="{StaticResource HDBlack}" />
<Setter Property="BackgroundColor" Value="{StaticResource HDLightGrey}" />
<Setter Property="FontFamily" Value="{DynamicResource LinuxLibertine}" />
</Style>
<Style TargetType="NavigationPage" ApplyToDerivedTypes="True"> <Style TargetType="NavigationPage" ApplyToDerivedTypes="True">
<Setter Property="BarBackgroundColor" Value="{StaticResource HDWhite}" /> <Setter Property="BarBackgroundColor" Value="{StaticResource HDWhite}" />
<Setter Property="BarTextColor" Value="{StaticResource HDRed}" /> <Setter Property="BarTextColor" Value="{StaticResource HDRed}" />

6
AideDeJeu/AideDeJeu/Markdig/MarkdownThemes.cs
View file

@ -20,6 +20,7 @@ namespace AideDeJeu.Tools
var fdLink = FormatedTextHelpers.FontData.FromResource("link"); var fdLink = FormatedTextHelpers.FontData.FromResource("link");
var fdTableHeader = FormatedTextHelpers.FontData.FromResource("tableheader"); var fdTableHeader = FormatedTextHelpers.FontData.FromResource("tableheader");
var fdTableCell = FormatedTextHelpers.FontData.FromResource("tablecell"); var fdTableCell = FormatedTextHelpers.FontData.FromResource("tablecell");
var fdTableCellAlt = FormatedTextHelpers.FontData.FromResource("tablecellalt");
this.Paragraph.FontFamily = fdParagraph.FontFamily; this.Paragraph.FontFamily = fdParagraph.FontFamily;
this.Paragraph.FontSize = (float)fdParagraph.FontSize; this.Paragraph.FontSize = (float)fdParagraph.FontSize;
@ -68,6 +69,11 @@ namespace AideDeJeu.Tools
this.TableCell.Attributes = fdTableCell.FontAttributes; this.TableCell.Attributes = fdTableCell.FontAttributes;
this.TableCell.ForegroundColor = fdTableCell.TextColor; this.TableCell.ForegroundColor = fdTableCell.TextColor;
this.TableCellAlt.FontFamily = fdTableCellAlt.FontFamily;
this.TableCellAlt.FontSize = (float)fdTableCellAlt.FontSize;
this.TableCellAlt.Attributes = fdTableCellAlt.FontAttributes;
this.TableCellAlt.ForegroundColor = fdTableCellAlt.TextColor;
//this.Link.ForegroundColor = DefaultAccentColor; //this.Link.ForegroundColor = DefaultAccentColor;
this.Code.ForegroundColor = DefaultTextColor; this.Code.ForegroundColor = DefaultTextColor;
this.Code.BackgroundColor = DefaultCodeBackground; this.Code.BackgroundColor = DefaultCodeBackground;

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

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

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

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