diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj index 0ca37d05..20799a9d 100644 --- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj +++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj @@ -432,6 +432,13 @@ + + + + + + + diff --git a/AideDeJeu/AideDeJeu.Android/Assets/Cinzel-Black.otf b/AideDeJeu/AideDeJeu.Android/Assets/Cinzel-Black.otf new file mode 100644 index 00000000..e1d142f1 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Assets/Cinzel-Black.otf differ diff --git a/AideDeJeu/AideDeJeu.Android/Assets/Cinzel-Bold.otf b/AideDeJeu/AideDeJeu.Android/Assets/Cinzel-Bold.otf new file mode 100644 index 00000000..736fb115 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Assets/Cinzel-Bold.otf differ diff --git a/AideDeJeu/AideDeJeu.Android/Assets/Cinzel-Regular.otf b/AideDeJeu/AideDeJeu.Android/Assets/Cinzel-Regular.otf new file mode 100644 index 00000000..2fa4b3ed Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Assets/Cinzel-Regular.otf differ diff --git a/AideDeJeu/AideDeJeu.Android/Assets/CinzelDecorative-Black.otf b/AideDeJeu/AideDeJeu.Android/Assets/CinzelDecorative-Black.otf new file mode 100644 index 00000000..e4aeef4d Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Assets/CinzelDecorative-Black.otf differ diff --git a/AideDeJeu/AideDeJeu.Android/Assets/CinzelDecorative-Bold.otf b/AideDeJeu/AideDeJeu.Android/Assets/CinzelDecorative-Bold.otf new file mode 100644 index 00000000..918600ff Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Assets/CinzelDecorative-Bold.otf differ diff --git a/AideDeJeu/AideDeJeu.Android/Assets/CinzelDecorative-Regular.otf b/AideDeJeu/AideDeJeu.Android/Assets/CinzelDecorative-Regular.otf new file mode 100644 index 00000000..9f6ddafc Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Assets/CinzelDecorative-Regular.otf differ diff --git a/AideDeJeu/AideDeJeu.Android/Assets/MarcellusSC-Regular.ttf b/AideDeJeu/AideDeJeu.Android/Assets/MarcellusSC-Regular.ttf new file mode 100644 index 00000000..7304b969 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Assets/MarcellusSC-Regular.ttf differ diff --git a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj index 14db536e..39361b1d 100644 --- a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj +++ b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj @@ -309,6 +309,13 @@ + + + + + + + diff --git a/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/Cinzel-Black.otf b/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/Cinzel-Black.otf new file mode 100644 index 00000000..e1d142f1 Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/Cinzel-Black.otf differ diff --git a/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/Cinzel-Bold.otf b/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/Cinzel-Bold.otf new file mode 100644 index 00000000..736fb115 Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/Cinzel-Bold.otf differ diff --git a/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/Cinzel-Regular.otf b/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/Cinzel-Regular.otf new file mode 100644 index 00000000..2fa4b3ed Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/Cinzel-Regular.otf differ diff --git a/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/CinzelDecorative-Black.otf b/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/CinzelDecorative-Black.otf new file mode 100644 index 00000000..e4aeef4d Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/CinzelDecorative-Black.otf differ diff --git a/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/CinzelDecorative-Bold.otf b/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/CinzelDecorative-Bold.otf new file mode 100644 index 00000000..918600ff Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/CinzelDecorative-Bold.otf differ diff --git a/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/CinzelDecorative-Regular.otf b/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/CinzelDecorative-Regular.otf new file mode 100644 index 00000000..9f6ddafc Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/CinzelDecorative-Regular.otf differ diff --git a/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/MarcellusSC-Regular.ttf b/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/MarcellusSC-Regular.ttf new file mode 100644 index 00000000..7304b969 Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/Assets/Fonts/MarcellusSC-Regular.ttf differ diff --git a/AideDeJeu/AideDeJeu/App.xaml b/AideDeJeu/AideDeJeu/App.xaml index e5b0a794..5dbf4ce5 100644 --- a/AideDeJeu/AideDeJeu/App.xaml +++ b/AideDeJeu/AideDeJeu/App.xaml @@ -24,26 +24,26 @@ - - + + - - + + - - + + - - + + diff --git a/AideDeJeu/AideDeJeu/MarkdownView/MarkdownView.cs b/AideDeJeu/AideDeJeu/MarkdownView/MarkdownView.cs index 7cda08b4..bcd2cb0e 100644 --- a/AideDeJeu/AideDeJeu/MarkdownView/MarkdownView.cs +++ b/AideDeJeu/AideDeJeu/MarkdownView/MarkdownView.cs @@ -206,6 +206,10 @@ Debug.WriteLine($"Can't render {block.GetType()} blocks."); break; } + if(subviews != null) + { + views.AddRange(subviews); + } if (views != null) { @@ -270,7 +274,8 @@ Spacing = this.Theme.Margin, }; - this.Render(block.AsEnumerable()); + var subv = this.Render(block.AsEnumerable()); + subv.ToList().ForEach(v => stack.Children.Add(v)); var horizontalStack = new StackLayout { diff --git a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml index 027b1496..71e54688 100644 --- a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml @@ -125,9 +125,8 @@ + +