Cancel / share

AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj

@@ -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>

AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj

@@ -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">

AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj

@@ -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\" />

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"
+  }
+}

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"
+  }
+}

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;
         }

AideDeJeu/AideDeJeu/Views/PlayerCharacter/PdfViewPage.xaml

@@ -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>

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<string> PdfFile { get; set; }
+
+        public ICommand CloseCommand
+        {
+            get
+            {
+                return new Command(ExecuteCloseCommand);
+            }
+        }
+
+        private void ExecuteCloseCommand()
+        {
+            Navigation.PopModalAsync(true);
+        }
     }
 }

Data/Icons/cancel.svg

@@ -0,0 +1 @@
+<svg style="height: 512px; width: 512px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M0 0h512v512H0z" fill="#fff" fill-opacity="0"></path><g class="" style="touch-action: none;" transform="translate(0,0)"><path d="M256 16C123.45 16 16 123.45 16 256s107.45 240 240 240 240-107.45 240-240S388.55 16 256 16zm0 60c99.41 0 180 80.59 180 180s-80.59 180-180 180S76 355.41 76 256 156.59 76 256 76zm-80.625 60c-.97-.005-2.006.112-3.063.313v-.032c-18.297 3.436-45.264 34.743-33.375 46.626l73.157 73.125-73.156 73.126c-14.63 14.625 29.275 58.534 43.906 43.906L256 299.906l73.156 73.156c14.63 14.628 58.537-29.28 43.906-43.906l-73.156-73.125 73.156-73.124c14.63-14.625-29.275-58.5-43.906-43.875L256 212.157l-73.156-73.125c-2.06-2.046-4.56-3.015-7.47-3.03z" fill="#000" fill-opacity="1"></path></g></svg>

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

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
 

Data/Icons/share.svg

@@ -0,0 +1 @@
+<svg style="height: 512px; width: 512px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M0 0h512v512H0z" fill="#fff" fill-opacity="0"></path><g class="" style="touch-action: none;" transform="translate(0,0)"><path d="M384 64a64 64 0 0 0-64 64 64 64 0 0 0 1.1 11.3l-146.3 73.2A64 64 0 0 0 128 192a64 64 0 0 0-64 64 64 64 0 0 0 64 64 64 64 0 0 0 46.8-20.5L321 372.7a64 64 0 0 0-1 11.3 64 64 0 0 0 64 64 64 64 0 0 0 64-64 64 64 0 0 0-64-64 64 64 0 0 0-46.8 20.5L191 267.4a64 64 0 0 0 1-11.4 64 64 0 0 0-1.1-11.4l146.3-73.1A64 64 0 0 0 384 192a64 64 0 0 0 64-64 64 64 0 0 0-64-64z" fill="#000" fill-opacity="1"></path></g></svg>