mirror of
				https://github.com/Nioux/AideDeJeu.git
				synced 2025-10-31 07:26:09 +00:00 
			
		
		
		
	Styles
This commit is contained in:
		
							parent
							
								
									b75ed319b4
								
							
						
					
					
						commit
						46c7948d81
					
				
					 10 changed files with 29 additions and 45 deletions
				
			
		|  | @ -22,6 +22,9 @@ | ||||||
|             <Color x:Key="HDWhite">#FFFFFF</Color> |             <Color x:Key="HDWhite">#FFFFFF</Color> | ||||||
|             <Color x:Key="HDBlack">#000000</Color> |             <Color x:Key="HDBlack">#000000</Color> | ||||||
| 
 | 
 | ||||||
|  |             <!--<Color x:Key="ParagraphBackgroundColor">{StaticResource HDWhite}</Color> | ||||||
|  |             <Color x:Key="ParagraphForegroundColor">HDBlack</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> | ||||||
|  | @ -238,9 +241,15 @@ | ||||||
|                 <Setter Property="FontAttributes" Value="Bold" /> |                 <Setter Property="FontAttributes" Value="Bold" /> | ||||||
|             </Style> |             </Style> | ||||||
| 
 | 
 | ||||||
|             <Style TargetType="NavigationPage"> |             <Style TargetType="NavigationPage" ApplyToDerivedTypes="True"> | ||||||
|                 <Setter Property="BarBackgroundColor" Value="{StaticResource HDRed}" /> |                 <Setter Property="BarBackgroundColor" Value="{StaticResource HDWhite}" /> | ||||||
|                 <Setter Property="BarTextColor" Value="{StaticResource HDWhite}" /> |                 <Setter Property="BarTextColor" Value="{StaticResource HDRed}" /> | ||||||
|  |                 <Setter Property="BackgroundColor" Value="{StaticResource HDWhite}" /> | ||||||
|  |             </Style> | ||||||
|  | 
 | ||||||
|  |             <Style TargetType="TabbedPage" ApplyToDerivedTypes="True"> | ||||||
|  |                 <Setter Property="BarBackgroundColor" Value="{StaticResource HDWhite}" /> | ||||||
|  |                 <Setter Property="BarTextColor" Value="{StaticResource HDMidGrey}" /> | ||||||
|                 <Setter Property="BackgroundColor" Value="{StaticResource HDWhite}" /> |                 <Setter Property="BackgroundColor" Value="{StaticResource HDWhite}" /> | ||||||
|             </Style> |             </Style> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -2,7 +2,7 @@ | ||||||
| <ContentPage xmlns="http://xamarin.com/schemas/2014/forms" | <ContentPage 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.AboutPage" |              x:Class="AideDeJeu.Views.AboutPage" | ||||||
|              xmlns:vm="clr-namespace:AideDeJeu.ViewModels;" |              xmlns:vm="clr-namespace:AideDeJeu.ViewModels" | ||||||
|              Title="{Binding Title}"> |              Title="{Binding Title}"> | ||||||
|     <ContentPage.BindingContext> |     <ContentPage.BindingContext> | ||||||
|         <vm:AboutViewModel /> |         <vm:AboutViewModel /> | ||||||
|  | @ -16,17 +16,17 @@ | ||||||
|             <ColumnDefinition Width="Auto" /> |             <ColumnDefinition Width="Auto" /> | ||||||
|             <ColumnDefinition Width="*" /> |             <ColumnDefinition Width="*" /> | ||||||
|         </Grid.ColumnDefinitions> |         </Grid.ColumnDefinitions> | ||||||
|         <StackLayout BackgroundColor="{StaticResource HDRed}" VerticalOptions="FillAndExpand" HorizontalOptions="Fill"> |         <StackLayout VerticalOptions="FillAndExpand" HorizontalOptions="Fill"> | ||||||
|             <StackLayout BackgroundColor="{StaticResource HDRed}" Orientation="Horizontal" HorizontalOptions="Center" VerticalOptions="Center"> |             <StackLayout Orientation="Horizontal" HorizontalOptions="Center" VerticalOptions="Center"> | ||||||
|                 <ContentView BackgroundColor="{StaticResource HDRed}" Padding="20,20,20,20" VerticalOptions="FillAndExpand"> |                 <ContentView Padding="20,20,20,20" VerticalOptions="FillAndExpand"> | ||||||
|                   <Image BackgroundColor="{StaticResource HDRed}" VerticalOptions="Center" HeightRequest="64" Source="black_book.png" /> |                   <Image VerticalOptions="Center" HeightRequest="64" Source="black_book.png" /> | ||||||
|                 </ContentView> |                 </ContentView> | ||||||
|             </StackLayout> |             </StackLayout> | ||||||
|         </StackLayout> |         </StackLayout> | ||||||
|         <StackLayout Grid.Column="1" Grid.Row="0" BackgroundColor="{StaticResource HDRed}" VerticalOptions="FillAndExpand" HorizontalOptions="Fill"> |         <StackLayout Grid.Column="1" Grid.Row="0" VerticalOptions="FillAndExpand" HorizontalOptions="Fill"> | ||||||
|             <StackLayout BackgroundColor="{StaticResource HDRed}" Padding="20,20,20,20" Orientation="Vertical" HorizontalOptions="Center" VerticalOptions="Center"> |             <StackLayout Padding="20,20,20,20" Orientation="Vertical" HorizontalOptions="Center" VerticalOptions="Center"> | ||||||
|                 <Label Text="Haches & Dés " Style="{StaticResource heading1}" FontSize="32" FontAttributes="Bold" TextColor="{StaticResource HDWhite}" HorizontalOptions="Center"/> |                 <Label Text="Haches & Dés " Style="{StaticResource heading1}" FontSize="32" FontAttributes="Bold" HorizontalOptions="Center"/> | ||||||
|                 <Label Text="{Binding Version, StringFormat='Version {0}'}" TextColor="{StaticResource HDWhite}" HorizontalOptions="Center"/> |                 <Label Text="{Binding Version, StringFormat='Version {0}'}" HorizontalOptions="Center"/> | ||||||
|             </StackLayout> |             </StackLayout> | ||||||
|         </StackLayout> |         </StackLayout> | ||||||
|         <ScrollView Grid.Row="1" Grid.ColumnSpan="2"> |         <ScrollView Grid.Row="1" Grid.ColumnSpan="2"> | ||||||
|  |  | ||||||
|  | @ -22,12 +22,6 @@ | ||||||
| 
 | 
 | ||||||
|             <Entry Grid.Column="0" Grid.Row="0" Style="{StaticResource heading1}" HorizontalOptions="FillAndExpand" /> |             <Entry Grid.Column="0" Grid.Row="0" Style="{StaticResource heading1}" HorizontalOptions="FillAndExpand" /> | ||||||
| 
 | 
 | ||||||
|             <!--<Image Grid.Column="1" Grid.Row="0" Source="settings_knobs.png"> |  | ||||||
|                 <Image.GestureRecognizers> |  | ||||||
|                     <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped" /> |  | ||||||
|                 </Image.GestureRecognizers> |  | ||||||
|             </Image>--> |  | ||||||
| 
 |  | ||||||
|             <ListView Grid.Column="0" Grid.Row="1" x:Name="ItemsListView" ItemsSource="{Binding BookmarkCollection}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped"> |             <ListView Grid.Column="0" Grid.Row="1" x:Name="ItemsListView" ItemsSource="{Binding BookmarkCollection}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped"> | ||||||
|                 <ListView.ItemTemplate> |                 <ListView.ItemTemplate> | ||||||
|                     <DataTemplate> |                     <DataTemplate> | ||||||
|  |  | ||||||
|  | @ -32,7 +32,7 @@ | ||||||
|             <ListView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" x:Name="ItemsListView" ItemsSource="{Binding BookmarkCollection}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped"> |             <ListView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" x:Name="ItemsListView" ItemsSource="{Binding BookmarkCollection}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped"> | ||||||
|                 <ListView.ItemTemplate> |                 <ListView.ItemTemplate> | ||||||
|                     <DataTemplate> |                     <DataTemplate> | ||||||
|                         <ViewCell AutomationProperties.IsInAccessibleTree="True" AutomationId="machin" AutomationProperties.Name="hop"> |                         <ViewCell> | ||||||
|                             <StackLayout Padding="10" Orientation="Vertical"> |                             <StackLayout Padding="10" Orientation="Vertical"> | ||||||
|                                 <Label Text="{Binding Name}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="16" /> |                                 <Label Text="{Binding Name}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="16" /> | ||||||
|                                 <Label Text="{Binding Link}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="12" /> |                                 <Label Text="{Binding Link}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="12" /> | ||||||
|  |  | ||||||
|  | @ -6,7 +6,6 @@ | ||||||
|     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 HDWhite}"  |  | ||||||
|     Title="Recherche" |     Title="Recherche" | ||||||
|     Icon="crystal_ball.png"> |     Icon="crystal_ball.png"> | ||||||
|     <ContentPage.Resources> |     <ContentPage.Resources> | ||||||
|  | @ -15,8 +14,6 @@ | ||||||
|         </ResourceDictionary> |         </ResourceDictionary> | ||||||
|     </ContentPage.Resources> |     </ContentPage.Resources> | ||||||
|     <ContentPage.ToolbarItems> |     <ContentPage.ToolbarItems> | ||||||
|         <!--<ToolbarItem Name="DeepSearch" Text="Rechercher..." Order="Primary" Icon="crystal_ball.png" Command="{Binding Main.Navigator.DeepSearchCommand}" />--> |  | ||||||
|         <!--<ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.Navigator.AboutCommand}" />--> |  | ||||||
|     </ContentPage.ToolbarItems> |     </ContentPage.ToolbarItems> | ||||||
|     <ContentPage.Content> |     <ContentPage.Content> | ||||||
|         <Grid> |         <Grid> | ||||||
|  |  | ||||||
|  | @ -11,11 +11,6 @@ | ||||||
|         <ToolbarItem Name="Filter" Text="Filtrer" Order="Primary" Icon="funnel.png" Clicked="Button_Clicked" /> |         <ToolbarItem Name="Filter" Text="Filtrer" Order="Primary" Icon="funnel.png" Clicked="Button_Clicked" /> | ||||||
|         <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star.png" Command="{Binding Main.Navigator.AddToFavoritesCommand}" /> |         <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star.png" Command="{Binding Main.Navigator.AddToFavoritesCommand}" /> | ||||||
|     </MasterDetailPage.ToolbarItems> |     </MasterDetailPage.ToolbarItems> | ||||||
|     <MasterDetailPage.Resources> |  | ||||||
|         <ResourceDictionary> |  | ||||||
|             <tools:SVGToBitmapConverter x:Key="SVGToBitmapConverter" /> |  | ||||||
|         </ResourceDictionary> |  | ||||||
|     </MasterDetailPage.Resources> |  | ||||||
|     <MasterDetailPage.Master> |     <MasterDetailPage.Master> | ||||||
|         <ContentPage Title=" "> |         <ContentPage Title=" "> | ||||||
|             <StackLayout Orientation="Vertical"> |             <StackLayout Orientation="Vertical"> | ||||||
|  |  | ||||||
|  | @ -15,8 +15,6 @@ | ||||||
|     </ContentPage.Resources> |     </ContentPage.Resources> | ||||||
|     <ContentPage.ToolbarItems> |     <ContentPage.ToolbarItems> | ||||||
|         <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star.png" Command="{Binding Main.Navigator.AddToFavoritesCommand}" /> |         <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star.png" Command="{Binding Main.Navigator.AddToFavoritesCommand}" /> | ||||||
|         <!--<ToolbarItem Name="DeepSearch" Text="Rechercher..." Order="Primary" Icon="crystal_ball.png" Command="{Binding Main.Navigator.DeepSearchCommand}" /> |  | ||||||
|         <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.Navigator.AboutCommand}" />--> |  | ||||||
|     </ContentPage.ToolbarItems> |     </ContentPage.ToolbarItems> | ||||||
|     <Grid> |     <Grid> | ||||||
|         <ScrollView Orientation="Vertical" BackgroundColor="{StaticResource HDWhite}"> |         <ScrollView Orientation="Vertical" BackgroundColor="{StaticResource HDWhite}"> | ||||||
|  |  | ||||||
|  | @ -17,8 +17,6 @@ | ||||||
|     </ContentPage.Resources> |     </ContentPage.Resources> | ||||||
|     <ContentPage.ToolbarItems> |     <ContentPage.ToolbarItems> | ||||||
|         <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star.png" Command="{Binding Main.Navigator.AddToFavoritesCommand}" /> |         <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star.png" Command="{Binding Main.Navigator.AddToFavoritesCommand}" /> | ||||||
|         <!--<ToolbarItem Name="DeepSearch" Text="Rechercher..." Order="Primary" Icon="crystal_ball.png" Command="{Binding Main.Navigator.DeepSearchCommand}" /> |  | ||||||
|         <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 HDWhite}" 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"> | ||||||
|  | @ -31,7 +29,7 @@ | ||||||
|             </ListView.Header> |             </ListView.Header> | ||||||
|             <ListView.ItemTemplate> |             <ListView.ItemTemplate> | ||||||
|                 <DataTemplate> |                 <DataTemplate> | ||||||
|                     <ViewCell AutomationProperties.IsInAccessibleTree="True" AutomationId="machin" AutomationProperties.Name="hop"> |                     <ViewCell> | ||||||
|                         <StackLayout Padding="10" Orientation="Vertical"> |                         <StackLayout Padding="10" Orientation="Vertical"> | ||||||
|                             <Label Text="{Binding Name}" LineBreakMode="WordWrap" TextColor="#0366d6" Style="{Binding NameLevel,Converter={StaticResource HeaderLevelToStyleConverter}}" /> |                             <Label Text="{Binding Name}" LineBreakMode="WordWrap" TextColor="#0366d6" Style="{Binding NameLevel,Converter={StaticResource HeaderLevelToStyleConverter}}" /> | ||||||
|                             <Label Text="{Binding AltNameText}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="12" /> |                             <Label Text="{Binding AltNameText}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="12" /> | ||||||
|  |  | ||||||
|  | @ -2,10 +2,7 @@ | ||||||
| <NavigationPage  | <NavigationPage  | ||||||
|     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 HDWhite}" |  | ||||||
|     BarBackgroundColor="{StaticResource HDWhite}" |  | ||||||
|     BarTextColor="{StaticResource HDRed}"> |  | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| </NavigationPage> | </NavigationPage> | ||||||
|  | @ -3,19 +3,15 @@ | ||||||
|     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" | ||||||
|     xmlns:views="clr-namespace:AideDeJeu.Views" |     xmlns:views="clr-namespace:AideDeJeu.Views" | ||||||
|  |     xmlns:windows="clr-namespace:Xamarin.Forms.PlatformConfiguration.WindowsSpecific;assembly=Xamarin.Forms.Core" | ||||||
|  |     xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core" | ||||||
|     x:Class="AideDeJeu.Views.MainTabbedPage" |     x:Class="AideDeJeu.Views.MainTabbedPage" | ||||||
|     Padding="0" |     Padding="0" | ||||||
|     BackgroundColor="{StaticResource HDWhite}" |  | ||||||
|     BarBackgroundColor="{StaticResource HDWhite}" |  | ||||||
|     BarTextColor="{StaticResource HDMidGrey}" |  | ||||||
|     xmlns:windows="clr-namespace:Xamarin.Forms.PlatformConfiguration.WindowsSpecific;assembly=Xamarin.Forms.Core" |  | ||||||
|     windows:TabbedPage.HeaderIconsEnabled="true" |  | ||||||
|     xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core" |  | ||||||
|     android:TabbedPage.ToolbarPlacement="Bottom" |     android:TabbedPage.ToolbarPlacement="Bottom" | ||||||
|     android:TabbedPage.IsSwipePagingEnabled="False" |     android:TabbedPage.IsSwipePagingEnabled="False" | ||||||
|     android:TabbedPage.BarItemColor="{StaticResource HDMidGrey}" |     android:TabbedPage.BarItemColor="{StaticResource HDMidGrey}" | ||||||
|     android:TabbedPage.BarSelectedItemColor="{StaticResource HDRed}" |     android:TabbedPage.BarSelectedItemColor="{StaticResource HDRed}" | ||||||
|     > |     windows:TabbedPage.HeaderIconsEnabled="true"> | ||||||
|     <windows:TabbedPage.HeaderIconsSize> |     <windows:TabbedPage.HeaderIconsSize> | ||||||
|         <Size> |         <Size> | ||||||
|             <x:Arguments> |             <x:Arguments> | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Yan Maniez
						Yan Maniez