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

Couleurs / icones

Browse source
This commit is contained in:
Yan Maniez 2018-09-13 10:48:01 +02:00
parent 493641350b
commit 2b35eff907
21 changed files with 133 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
View file

@ -131,6 +131,10 @@
<ItemGroup>
<None Include="Package.StoreAssociation.xml" />
<Content Include="crystal_ball.png" />
<Content Include="dragon_head.png" />
<Content Include="funnel.png" />
<Content Include="icon.png" />
<Content Include="ic_launcher.png" />
<Content Include="Properties\Default.rd.xml" />
<Content Include="Assets\LockScreenLogo.scale-100.png" />
<Content Include="Assets\LockScreenLogo.scale-125.png" />
@ -163,6 +167,11 @@
<Content Include="Assets\Wide310x150Logo.scale-150.png" />
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
<Content Include="Assets\Wide310x150Logo.scale-400.png" />
<Content Include="round_star.png" />
<Content Include="settings_knobs.png" />
<Content Include="spell_book.png" />
<Content Include="stars_stack.png" />
<Content Include="wooden_sign.png" />
<Content Include="xamarin_logo.png" />
</ItemGroup>
<ItemGroup>

BIN
AideDeJeu/AideDeJeu.UWP/crystal_ball.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Before After
Before After

BIN
AideDeJeu/AideDeJeu.UWP/dragon_head.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
AideDeJeu/AideDeJeu.UWP/funnel.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
AideDeJeu/AideDeJeu.UWP/ic_launcher.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
AideDeJeu/AideDeJeu.UWP/icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
AideDeJeu/AideDeJeu.UWP/round_star.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
AideDeJeu/AideDeJeu.UWP/settings_knobs.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 889 B

BIN
AideDeJeu/AideDeJeu.UWP/spell_book.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
AideDeJeu/AideDeJeu.UWP/stars_stack.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
AideDeJeu/AideDeJeu.UWP/wooden_sign.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

3
AideDeJeu/AideDeJeu/AideDeJeu.csproj
View file

@ -344,6 +344,9 @@
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resource.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Views\BookmarksEditPage.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Views\BookmarksPage.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>

64
AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml Normal file
View file

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:tools="clr-namespace:AideDeJeu.Tools"
x:Class="AideDeJeu.Views.BookmarksEditPage"
x:Name="This"
Title="Favoris">
<ContentPage.Resources>
<ResourceDictionary>
<tools:IntToBooleanConverter x:Key="IntToBooleanConverter" NonZeroValue="False" NullOrZeroValue="True" />
</ResourceDictionary>
</ContentPage.Resources>
<ContentPage.Content>
<Grid BackgroundColor="{StaticResource bgtan}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<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" Grid.ColumnSpan="2" x:Name="ItemsListView" ItemsSource="{Binding BookmarkCollection}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
<ListView.ItemTemplate>
<DataTemplate>
<ViewCell>
<Grid Padding="10">
<Label Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3" Text="{Binding Name}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="16" />
<Label Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Text="{Binding Link}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="12" />
<Image Grid.Column="0" Grid.Row="2" BackgroundColor="#FF0000" WidthRequest="20" HeightRequest="20" />
<Image Grid.Column="1" Grid.Row="2" BackgroundColor="#00FF00" WidthRequest="20" HeightRequest="20" />
<Image Grid.Column="2" Grid.Row="2" BackgroundColor="#0000FF" WidthRequest="20" HeightRequest="20" />
</Grid>
</ViewCell>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
<ActivityIndicator
Grid.Column="0" Grid.Row="0"
VerticalOptions="StartAndExpand"
HorizontalOptions="End"
Color="{StaticResource titlered}"
IsRunning="{Binding BindingContext.Main.IsLoading, Source={x:Reference This}}"
IsVisible="{Binding BindingContext.Main.IsLoading, Source={x:Reference This}}">
<ActivityIndicator.WidthRequest>
<OnPlatform x:TypeArguments="x:Double" iOS="50" WinPhone="400" Android="50" />
</ActivityIndicator.WidthRequest>
<ActivityIndicator.HeightRequest>
<OnPlatform x:TypeArguments="x:Double" iOS="50" WinPhone="10" Android="50" />
</ActivityIndicator.HeightRequest>
</ActivityIndicator>
</Grid>
</ContentPage.Content>
</ContentPage>

33
AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml.cs Normal file
View file

@ -0,0 +1,33 @@
using AideDeJeu.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
namespace AideDeJeu.Views
{
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class BookmarksEditPage : ContentPage
{
public BookmarksEditPage ()
{
InitializeComponent ();
BindingContext = DependencyService.Get<BookmarksViewModel>();
}
private async void TapGestureRecognizer_Tapped(object sender, EventArgs e)
{
await Navigation.PopAsync();
}
private async void ItemsListView_ItemTapped(object sender, ItemTappedEventArgs e)
{
}
}
}

2
AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml
View file

@ -21,7 +21,7 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Picker Grid.Column="0" Grid.Row="0" Style="{StaticResource heading1}" HorizontalOptions="FillAndExpand" ItemsSource="{Binding BookmarkCollectionNames, Mode=OneWay}" ItemDisplayBinding="{Binding Mode=OneWay}" SelectedIndex="{Binding BookmarkCollectionIndex, Mode=TwoWay}" />
<Picker Grid.Column="0" Grid.Row="0" Style="{StaticResource heading1}" HorizontalOptions="Fill" ItemsSource="{Binding BookmarkCollectionNames, Mode=OneWay}" ItemDisplayBinding="{Binding Mode=OneWay}" SelectedIndex="{Binding BookmarkCollectionIndex, Mode=TwoWay}" />
<Image Grid.Column="1" Grid.Row="0" Source="settings_knobs.png">
<Image.GestureRecognizers>

4
AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml.cs
View file

@ -28,9 +28,9 @@ namespace AideDeJeu.Views
await Main.Navigator.NavigateToLinkAsync(item.Link);
}
private void TapGestureRecognizer_Tapped(object sender, EventArgs e)
private async void TapGestureRecognizer_Tapped(object sender, EventArgs e)
{
await Navigation.PushAsync(new BookmarksEditPage());
}
}
}

2
AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml
View file

@ -8,7 +8,7 @@
x:Name="This"
Title="{Binding Title}">
<MasterDetailPage.ToolbarItems>
<ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star" 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}" />-->
</MasterDetailPage.ToolbarItems>

3
AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml
View file

@ -5,6 +5,7 @@
xmlns:mdview="clr-namespace:Xam.Forms.Markdown"
x:Class="AideDeJeu.Views.ItemDetailPage"
Title="{Binding Title}"
Icon="spell_book.png"
x:Name="This">
<ContentPage.Resources>
<ResourceDictionary>
@ -13,7 +14,7 @@
</ResourceDictionary>
</ContentPage.Resources>
<ContentPage.ToolbarItems>
<ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star" 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>

2
AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
View file

@ -16,7 +16,7 @@
</ResourceDictionary>
</ContentPage.Resources>
<ContentPage.ToolbarItems>
<ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star" 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>

8
AideDeJeu/AideDeJeu/Views/MainNavigationPage.xaml
View file

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<NavigationPage xmlns="http://xamarin.com/schemas/2014/forms"
<NavigationPage
xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="AideDeJeu.Views.MainNavigationPage">
x:Class="AideDeJeu.Views.MainNavigationPage"
BackgroundColor="{StaticResource bgtan}"
BarBackgroundColor="{StaticResource rulered}"
BarTextColor="{StaticResource bgtan}">
</NavigationPage>

25
AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml
View file

@ -3,9 +3,14 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:views="clr-namespace:AideDeJeu.Views"
x:Class="AideDeJeu.Views.MainTabbedPage"
Padding="0">
Padding="0"
BackgroundColor="{StaticResource bgtan}"
BarBackgroundColor="{StaticResource rulered}"
BarTextColor="{StaticResource bgtan}"
xmlns:windows="clr-namespace:Xamarin.Forms.PlatformConfiguration.WindowsSpecific;assembly=Xamarin.Forms.Core"
windows:TabbedPage.HeaderIconsEnabled="true">
<!--Pages can be added as references or inline-->
<views:MainNavigationPage x:Name="NavigationPage" Icon="spell_book">
<views:MainNavigationPage x:Name="NavigationPage" Icon="spell_book.png">
<views:MainNavigationPage.Title>
<OnPlatform x:TypeArguments="x:String" Android="" Default="Bibliothèque" WinPhone="Bibliothèque"/>
</views:MainNavigationPage.Title>
@ -13,7 +18,7 @@
<views:ItemDetailPage />
</x:Arguments>
</views:MainNavigationPage>
<views:MainNavigationPage Icon="stars_stack">
<views:MainNavigationPage Icon="stars_stack.png">
<views:MainNavigationPage.Title>
<OnPlatform x:TypeArguments="x:String" Android="" Default="Favoris" WinPhone="Favoris"/>
</views:MainNavigationPage.Title>
@ -21,7 +26,7 @@
<views:BookmarksPage />
</x:Arguments>
</views:MainNavigationPage>
<views:MainNavigationPage Icon="crystal_ball">
<views:MainNavigationPage Icon="crystal_ball.png">
<views:MainNavigationPage.Title>
<OnPlatform x:TypeArguments="x:String" Android="" Default="Recherche" WinPhone="Recherche"/>
</views:MainNavigationPage.Title>
@ -29,17 +34,7 @@
<views:DeepSearchPage />
</x:Arguments>
</views:MainNavigationPage>
<!--<views:BookmarksPage Icon="stars_stack">
<views:BookmarksPage.Title>
<OnPlatform x:TypeArguments="x:String" Android="" Default="Favoris" WinPhone="Favoris"/>
</views:BookmarksPage.Title>
</views:BookmarksPage>
<views:DeepSearchPage Icon="crystal_ball">
<views:DeepSearchPage.Title>
<OnPlatform x:TypeArguments="x:String" Android="" Default="Recherche" WinPhone="Recherche" />
</views:DeepSearchPage.Title>
</views:DeepSearchPage>-->
<views:AboutPage Title="?" Icon="wooden_sign">
<views:AboutPage Title="?" Icon="wooden_sign.png">
<views:AboutPage.Title>
<OnPlatform x:TypeArguments="x:String" Android="" Default="À propos de..." WinPhone="À propos de..." />
</views:AboutPage.Title>