1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-30 15:06:06 +00:00
This commit is contained in:
Yan Maniez 2018-09-14 00:57:50 +02:00
parent 64c13e3b3b
commit 0a05d158af
10 changed files with 34 additions and 20 deletions

View file

@ -4,6 +4,18 @@
x:Class="AideDeJeu.App"> x:Class="AideDeJeu.App">
<Application.Resources> <Application.Resources>
<ResourceDictionary> <ResourceDictionary>
<Color x:Key="HDRed">#9B1C47</Color>
<Color x:Key="HDGrey">#563F5A</Color>
<Color x:Key="HDMidGrey">#6F5B73</Color>
<Color x:Key="HDLightGrey">#7C7B7B</Color>
<Color x:Key="HDLightBlack">#3A213C</Color>
<Color x:Key="HDBackMidGrey">#B5AAB9</Color>
<Color x:Key="HDBackLightGrey">#EDEDED</Color>
<Color x:Key="HDWhite">#FFFFFF</Color>
<Color x:Key="HDBlack">#000000</Color>
<Color x:Key="Primary">#2196F3</Color> <Color x:Key="Primary">#2196F3</Color>
<Color x:Key="PrimaryDark">#1976D2</Color> <Color x:Key="PrimaryDark">#1976D2</Color>
<Color x:Key="Accent">#96d1ff</Color> <Color x:Key="Accent">#96d1ff</Color>
@ -48,7 +60,7 @@
<Color x:Key="tablecolor">#E0E5C1</Color> <!--% table even row background--> <Color x:Key="tablecolor">#E0E5C1</Color> <!--% table even row background-->
<!--% Element colors that do not respond to \setthemecolor--> <!--% Element colors that do not respond to \setthemecolor-->
<Color x:Key="quoteboxcolor">#F7F2E5</Color> <!--% quotebox background--> <Color x:Key="quoteboxcolor">#FFFFFF</Color> <!--% quotebox background-->
<Color x:Key="statblockribbon">#E69A28</Color> <!--% stat block top/bottom borders (gold)--> <Color x:Key="statblockribbon">#E69A28</Color> <!--% stat block top/bottom borders (gold)-->
<Color x:Key="statblockbg">#FDF1DC</Color> <!--% stat block background (tan)--> <Color x:Key="statblockbg">#FDF1DC</Color> <!--% stat block background (tan)-->
@ -68,13 +80,13 @@
<Color x:Key="monstertandark">#F0DBB5</Color> <Color x:Key="monstertandark">#F0DBB5</Color>
<Style TargetType="ContentPage"> <Style TargetType="ContentPage">
<Setter Property="BackgroundColor" Value="{StaticResource bgtan}" /> <Setter Property="BackgroundColor" Value="{StaticResource HDWhite}" />
</Style> </Style>
<Style TargetType="StackLayout"> <Style TargetType="StackLayout">
<Setter Property="BackgroundColor" Value="{StaticResource bgtan}" /> <Setter Property="BackgroundColor" Value="{StaticResource HDWhite}" />
</Style> </Style>
<Style TargetType="ScrollView"> <Style TargetType="ScrollView">
<Setter Property="BackgroundColor" Value="{StaticResource bgtan}" /> <Setter Property="BackgroundColor" Value="{StaticResource HDWhite}" />
</Style> </Style>
<OnPlatform x:Key="LinuxLibertineCapitals" x:TypeArguments="x:String"> <OnPlatform x:Key="LinuxLibertineCapitals" x:TypeArguments="x:String">
@ -221,9 +233,10 @@
<Style TargetType="NavigationPage"> <Style TargetType="NavigationPage">
<Setter Property="BarBackgroundColor" Value="{StaticResource titlered}" /> <Setter Property="BarBackgroundColor" Value="{StaticResource titlered}" />
<Setter Property="BarTextColor" Value="{StaticResource bgtan}" /> <Setter Property="BarTextColor" Value="{StaticResource HDWhite}" />
<Setter Property="BackgroundColor" Value="{StaticResource bgtan}" /> <Setter Property="BackgroundColor" Value="{StaticResource HDWhite}" />
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>
</Application.Resources> </Application.Resources>
</Application> </Application>

View file

@ -21,7 +21,7 @@ namespace AideDeJeu
var tabbeddPage = new AideDeJeu.Views.MainTabbedPage(); var tabbeddPage = new AideDeJeu.Views.MainTabbedPage();
//var mainPage = new ItemDetailPage(new ItemDetailViewModel(new HomeItem()) { Title = "Haches & Dés" }); //var mainPage = new ItemDetailPage(new ItemDetailViewModel(new HomeItem()) { Title = "Haches & Dés" });
var titlered = (Color)Resources["titlered"]; var titlered = (Color)Resources["titlered"];
var bgtan = (Color)Resources["bgtan"]; var bgtan = (Color)Resources["HDWhite"];
//var navigationPage = new MainNavigationPage(mainPage) { BarBackgroundColor = titlered, BarTextColor = bgtan }; //var navigationPage = new MainNavigationPage(mainPage) { BarBackgroundColor = titlered, BarTextColor = bgtan };
//tabbeddPage.MainNavigationPage = navigationPage; //tabbeddPage.MainNavigationPage = navigationPage;
var navigationPage = tabbeddPage.MainNavigationPage; var navigationPage = tabbeddPage.MainNavigationPage;

View file

@ -43,7 +43,7 @@ namespace AideDeJeu.Tools
this.Separator.BorderColor = DefaultSeparatorColor; this.Separator.BorderColor = DefaultSeparatorColor;
} }
public static readonly Color DefaultBackgroundColor = Color.FromHex("#F7F2E5"); public static readonly Color DefaultBackgroundColor = Color.FromHex("#FFFFFF");
public static readonly Color DefaultAccentColor = Color.FromHex("#0366d6"); public static readonly Color DefaultAccentColor = Color.FromHex("#0366d6");

View file

@ -25,8 +25,8 @@
</StackLayout> </StackLayout>
<StackLayout Grid.Column="1" Grid.Row="0" BackgroundColor="{StaticResource titlered}" VerticalOptions="FillAndExpand" HorizontalOptions="Fill"> <StackLayout Grid.Column="1" Grid.Row="0" BackgroundColor="{StaticResource titlered}" VerticalOptions="FillAndExpand" HorizontalOptions="Fill">
<StackLayout BackgroundColor="{StaticResource titlered}" Padding="20,20,20,20" Orientation="Vertical" HorizontalOptions="Center" VerticalOptions="Center"> <StackLayout BackgroundColor="{StaticResource titlered}" Padding="20,20,20,20" Orientation="Vertical" HorizontalOptions="Center" VerticalOptions="Center">
<Label Text="Haches &amp; Dés " Style="{StaticResource heading1}" FontSize="32" FontAttributes="Bold" TextColor="{StaticResource bgtan}" HorizontalOptions="Center"/> <Label Text="Haches &amp; Dés " Style="{StaticResource heading1}" FontSize="32" FontAttributes="Bold" TextColor="{StaticResource HDWhite}" HorizontalOptions="Center"/>
<Label Text="{Binding Version, StringFormat='Version {0}'}" TextColor="{StaticResource bgtan}" HorizontalOptions="Center"/> <Label Text="{Binding Version, StringFormat='Version {0}'}" TextColor="{StaticResource HDWhite}" HorizontalOptions="Center"/>
</StackLayout> </StackLayout>
</StackLayout> </StackLayout>
<ScrollView Grid.Row="1" Grid.ColumnSpan="2"> <ScrollView Grid.Row="1" Grid.ColumnSpan="2">

View file

@ -11,7 +11,7 @@
</ResourceDictionary> </ResourceDictionary>
</ContentPage.Resources> </ContentPage.Resources>
<ContentPage.Content> <ContentPage.Content>
<Grid BackgroundColor="{StaticResource bgtan}"> <Grid BackgroundColor="{StaticResource HDWhite}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />

View file

@ -11,7 +11,7 @@
</ResourceDictionary> </ResourceDictionary>
</ContentPage.Resources> </ContentPage.Resources>
<ContentPage.Content> <ContentPage.Content>
<Grid BackgroundColor="{StaticResource bgtan}"> <Grid BackgroundColor="{StaticResource HDWhite}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />

View file

@ -6,7 +6,7 @@
xmlns:tools="clr-namespace:AideDeJeu.Tools" xmlns:tools="clr-namespace:AideDeJeu.Tools"
xmlns:properties="clr-namespace:AideDeJeu.Properties" xmlns:properties="clr-namespace:AideDeJeu.Properties"
x:Name="This" x:Name="This"
BackgroundColor="{StaticResource bgtan}" BackgroundColor="{StaticResource HDWhite}"
Title="Recherche" Title="Recherche"
Icon="crystal_ball.png"> Icon="crystal_ball.png">
<ContentPage.Resources> <ContentPage.Resources>

View file

@ -21,7 +21,7 @@
<ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.Navigator.AboutCommand}" />--> <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.Navigator.AboutCommand}" />-->
</ContentPage.ToolbarItems> </ContentPage.ToolbarItems>
<Grid> <Grid>
<ListView BackgroundColor="{StaticResource bgtan}" x:Name="ItemsListView" ItemsSource="{Binding Children}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped"> <ListView BackgroundColor="{StaticResource HDWhite}" x:Name="ItemsListView" ItemsSource="{Binding Children}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
<ListView.Header> <ListView.Header>
<mdview:MarkdownView <mdview:MarkdownView
Theme="{StaticResource MonsterMarkdownTheme}" Theme="{StaticResource MonsterMarkdownTheme}"

View file

@ -3,8 +3,9 @@
xmlns="http://xamarin.com/schemas/2014/forms" xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="AideDeJeu.Views.MainNavigationPage" x:Class="AideDeJeu.Views.MainNavigationPage"
BackgroundColor="{StaticResource bgtan}" BackgroundColor="{StaticResource HDWhite}"
BarBackgroundColor="{StaticResource rulered}" BarBackgroundColor="{StaticResource HDWhite}"
BarTextColor="{StaticResource bgtan}"> BarTextColor="{StaticResource HDRed}">
</NavigationPage> </NavigationPage>

View file

@ -5,9 +5,9 @@
xmlns:views="clr-namespace:AideDeJeu.Views" xmlns:views="clr-namespace:AideDeJeu.Views"
x:Class="AideDeJeu.Views.MainTabbedPage" x:Class="AideDeJeu.Views.MainTabbedPage"
Padding="0" Padding="0"
BackgroundColor="{StaticResource bgtan}" BackgroundColor="{StaticResource HDWhite}"
BarBackgroundColor="{StaticResource rulered}" BarBackgroundColor="{StaticResource HDWhite}"
BarTextColor="{StaticResource bgtan}" BarTextColor="{StaticResource HDGrey}"
xmlns:windows="clr-namespace:Xamarin.Forms.PlatformConfiguration.WindowsSpecific;assembly=Xamarin.Forms.Core" xmlns:windows="clr-namespace:Xamarin.Forms.PlatformConfiguration.WindowsSpecific;assembly=Xamarin.Forms.Core"
windows:TabbedPage.HeaderIconsEnabled="true" windows:TabbedPage.HeaderIconsEnabled="true"
xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core" xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"