5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-12-22 01:53:24 +00:00
Code Issues Projects Releases Wiki Activity

Cancel / share

Browse source
This commit is contained in:
Yan Maniez 2019-05-12 19:28:51 +02:00
parent be7b704112
commit f5bebf92c2
24 changed files with 277 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
View file

@ -526,6 +526,13 @@
<ItemGroup>
<AndroidResource Include="Resources\drawable\rolling_dice_cup.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\cancel.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\share.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi\crystal_ball.png" />
</ItemGroup>
@ -574,6 +581,13 @@
<ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi\rolling_dice_cup.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi\cancel.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi\share.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\crystal_ball.png" />
</ItemGroup>
@ -622,6 +636,13 @@
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\rolling_dice_cup.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\cancel.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\share.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\crystal_ball.png" />
</ItemGroup>
@ -670,6 +691,13 @@
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\rolling_dice_cup.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\cancel.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\share.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
</ItemGroup>

BIN
AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/cancel.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/share.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 797 B

BIN
AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/cancel.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/share.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/cancel.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/share.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
AideDeJeu/AideDeJeu.Android/Resources/drawable/cancel.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
AideDeJeu/AideDeJeu.Android/Resources/drawable/share.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 797 B

2
AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
View file

@ -595,6 +595,8 @@
<Content Include="d20.png" />
<Content Include="cubes.png" />
<Content Include="rolling_dice_cup.png" />
<Content Include="cancel.png" />
<Content Include="share.png" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

12
AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
View file

@ -307,6 +307,12 @@
<ImageAsset Include="Media.xcassets\rolling_dice_cup.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\cancel.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\share.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\crystal_ball.imageset\crystal_ball.png">
<Visible>false</Visible>
</ImageAsset>
@ -367,6 +373,12 @@
<ImageAsset Include="Media.xcassets\rolling_dice_cup.imageset\rolling_dice_cup.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\cancel.imageset\cancel.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\share.imageset\share.png">
<Visible>false</Visible>
</ImageAsset>
</ItemGroup>
<ItemGroup>
<Folder Include="Media.xcassets\crystal_ball.imageset\" />

94
AideDeJeu/AideDeJeu.iOS/Media.xcassets/cancel.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,94 @@
{
"images": [
{
"idiom": "universal"
},
{
"scale": "1x",
"idiom": "universal"
},
{
"scale": "2x",
"idiom": "universal"
},
{
"filename": "cancel.png",
"scale": "3x",
"idiom": "universal"
},
{
"idiom": "iphone"
},
{
"scale": "1x",
"idiom": "iphone"
},
{
"scale": "2x",
"idiom": "iphone"
},
{
"subtype": "retina4",
"scale": "2x",
"idiom": "iphone"
},
{
"scale": "3x",
"idiom": "iphone"
},
{
"idiom": "ipad"
},
{
"scale": "1x",
"idiom": "ipad"
},
{
"scale": "2x",
"idiom": "ipad"
},
{
"idiom": "watch"
},
{
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{130,145}",
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{146,165}",
"scale": "2x",
"idiom": "watch"
},
{
"idiom": "mac"
},
{
"scale": "1x",
"idiom": "mac"
},
{
"scale": "2x",
"idiom": "mac"
},
{
"idiom": "car"
},
{
"scale": "2x",
"idiom": "car"
},
{
"scale": "3x",
"idiom": "car"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}

BIN
AideDeJeu/AideDeJeu.iOS/Media.xcassets/cancel.imageset/cancel.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

94
AideDeJeu/AideDeJeu.iOS/Media.xcassets/share.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,94 @@
{
"images": [
{
"idiom": "universal"
},
{
"scale": "1x",
"idiom": "universal"
},
{
"scale": "2x",
"idiom": "universal"
},
{
"filename": "share.png",
"scale": "3x",
"idiom": "universal"
},
{
"idiom": "iphone"
},
{
"scale": "1x",
"idiom": "iphone"
},
{
"scale": "2x",
"idiom": "iphone"
},
{
"subtype": "retina4",
"scale": "2x",
"idiom": "iphone"
},
{
"scale": "3x",
"idiom": "iphone"
},
{
"idiom": "ipad"
},
{
"scale": "1x",
"idiom": "ipad"
},
{
"scale": "2x",
"idiom": "ipad"
},
{
"idiom": "watch"
},
{
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{130,145}",
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{146,165}",
"scale": "2x",
"idiom": "watch"
},
{
"idiom": "mac"
},
{
"scale": "1x",
"idiom": "mac"
},
{
"scale": "2x",
"idiom": "mac"
},
{
"idiom": "car"
},
{
"scale": "2x",
"idiom": "car"
},
{
"scale": "3x",
"idiom": "car"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}

BIN
AideDeJeu/AideDeJeu.iOS/Media.xcassets/share.imageset/share.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 897 B

4
AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs
View file

@ -40,7 +40,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter
// raz des listes de choix
ResetAlignments();
await ResetAlignments();
Races = await Task.Run(async () => await LoadRacesAsync());
Classes = await Task.Run(async () => await LoadClassesAsync());
Backgrounds = await Task.Run(async () => await LoadBackgroundsAsync());
@ -348,7 +348,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter
//SubBackgroundSpecialties = null;
SelectedPlayerCharacter.Background.BackgroundSkill = await LoadSkillAsync(background);
//SubBackgroundSkill = null;
ResetAlignments();
await ResetAlignments();
}
return background;
}

24
AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml
View file

@ -2,16 +2,36 @@
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:views="clr-namespace:AideDeJeu.Views"
x:Class="AideDeJeu.Views.PlayerCharacter.PdfViewPage">
x:Class="AideDeJeu.Views.PlayerCharacter.PdfViewPage"
x:Name="this">
<ContentPage.Content>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<ImageButton Grid.Column="0" HeightRequest="32" Margin="5" Source="cancel.png" Command="{Binding CloseCommand, Source={x:Reference this}}"/>
<ImageButton Grid.Column="2" HeightRequest="32" Margin="5" Source="share.png" />
<ActivityIndicator
Grid.Row="1"
Grid.ColumnSpan="3"
IsRunning="{Binding PdfFile.IsNotCompleted}"
IsVisible="{Binding PdfFile.IsNotCompleted}"
VerticalOptions="CenterAndExpand"
HorizontalOptions="CenterAndExpand" />
<views:PdfView IsVisible="{Binding PdfFile.IsSuccessfullyCompleted}" Uri="{Binding PdfFile.Result}" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand"/>
<views:PdfView
Grid.Row="1"
Grid.ColumnSpan="3"
IsVisible="{Binding PdfFile.IsSuccessfullyCompleted}"
Uri="{Binding PdfFile.Result}"
HorizontalOptions="FillAndExpand"
VerticalOptions="FillAndExpand"/>
</Grid>
</ContentPage.Content>
</ContentPage>

15
AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml.cs
View file

@ -5,7 +5,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
@ -20,5 +20,18 @@ namespace AideDeJeu.Views.PlayerCharacter
}
public NotifyTaskCompletion<string> PdfFile { get; set; }
public ICommand CloseCommand
{
get
{
return new Command(ExecuteCloseCommand);
}
}
private void ExecuteCloseCommand()
{
Navigation.PopModalAsync(true);
}
}
}