diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj index 07ea37dd..6f3c84b1 100644 --- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj +++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj @@ -526,6 +526,13 @@ + + + + + + + @@ -574,6 +581,13 @@ + + + + + + + @@ -622,6 +636,13 @@ + + + + + + + @@ -670,6 +691,13 @@ + + + + + + + diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/cancel.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/cancel.png new file mode 100644 index 00000000..6e9e07ce Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/cancel.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/share.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/share.png new file mode 100644 index 00000000..bc0ad242 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/share.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/cancel.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/cancel.png new file mode 100644 index 00000000..71dcd71d Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/cancel.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/share.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/share.png new file mode 100644 index 00000000..2cd3676c Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/share.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/cancel.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/cancel.png new file mode 100644 index 00000000..ac0ef6ee Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/cancel.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/share.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/share.png new file mode 100644 index 00000000..7d0cb1b2 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/share.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable/cancel.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable/cancel.png new file mode 100644 index 00000000..6e9e07ce Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable/cancel.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable/share.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable/share.png new file mode 100644 index 00000000..bc0ad242 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable/share.png differ diff --git a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj index e1206d06..01b50488 100644 --- a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj +++ b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj @@ -595,6 +595,8 @@ + + diff --git a/AideDeJeu/AideDeJeu.UWP/cancel.png b/AideDeJeu/AideDeJeu.UWP/cancel.png new file mode 100644 index 00000000..ac0ef6ee Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/cancel.png differ diff --git a/AideDeJeu/AideDeJeu.UWP/share.png b/AideDeJeu/AideDeJeu.UWP/share.png new file mode 100644 index 00000000..7d0cb1b2 Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/share.png differ diff --git a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj index b5baf4c2..ffce7973 100644 --- a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj +++ b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj @@ -307,6 +307,12 @@ false + + false + + + false + false @@ -367,6 +373,12 @@ false + + false + + + false + diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/cancel.imageset/Contents.json b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/cancel.imageset/Contents.json new file mode 100644 index 00000000..d49d4fe3 --- /dev/null +++ b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/cancel.imageset/Contents.json @@ -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" + } +} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/cancel.imageset/cancel.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/cancel.imageset/cancel.png new file mode 100644 index 00000000..8a66534d Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/cancel.imageset/cancel.png differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/share.imageset/Contents.json b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/share.imageset/Contents.json new file mode 100644 index 00000000..44fe0847 --- /dev/null +++ b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/share.imageset/Contents.json @@ -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" + } +} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/share.imageset/share.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/share.imageset/share.png new file mode 100644 index 00000000..8ec689f2 Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/share.imageset/share.png differ diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs index 0e1d5ac1..7731a5d9 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs @@ -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; } diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml index 4de49ae7..4ff7924b 100644 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml @@ -2,16 +2,36 @@ + x:Class="AideDeJeu.Views.PlayerCharacter.PdfViewPage" + x:Name="this"> + + + + + + + + + + + - + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml.cs index b4c8815b..115f945e 100644 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml.cs @@ -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 PdfFile { get; set; } + + public ICommand CloseCommand + { + get + { + return new Command(ExecuteCloseCommand); + } + } + + private void ExecuteCloseCommand() + { + Navigation.PopModalAsync(true); + } } } \ No newline at end of file diff --git a/Data/Icons/cancel.svg b/Data/Icons/cancel.svg new file mode 100644 index 00000000..10c1a2aa --- /dev/null +++ b/Data/Icons/cancel.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Data/Icons/convert.bat b/Data/Icons/convert.bat index c9261d5d..998a71fc 100644 --- a/Data/Icons/convert.bat +++ b/Data/Icons/convert.bat @@ -43,8 +43,12 @@ call convertone.bat cubes cubes call convertone.bat rolling_dice_cup rolling-dice-cup -:nouveau - call convertone.bat battle_axe battle-axe +:nouveau + +call convertone.bat share share + +call convertone.bat cancel cancel + pause diff --git a/Data/Icons/convertone.bat b/Data/Icons/convertone.bat index c6e18a2f..bd3b5272 100644 --- a/Data/Icons/convertone.bat +++ b/Data/Icons/convertone.bat @@ -3,7 +3,7 @@ set ANDROID_PATH=..\..\AideDeJeu\AideDeJeu.Android\Resources\ set UWP_PATH=..\..\AideDeJeu\AideDeJeu.UWP\ set IOS_PATH=..\..\AideDeJeu\AideDeJeu.iOS\Media.xcassets\ -goto ios +rem goto ios :android diff --git a/Data/Icons/share.svg b/Data/Icons/share.svg new file mode 100644 index 00000000..d6f00ed1 --- /dev/null +++ b/Data/Icons/share.svg @@ -0,0 +1 @@ + \ No newline at end of file