From b10dda447df0483a66586d67a3cf812afe59ffdd Mon Sep 17 00:00:00 2001
From: Maniez Yan <FR19960@fr01.awl.atosorigin.net>
Date: Sun, 10 Feb 2019 03:07:36 +0100
Subject: [PATCH] =?UTF-8?q?Probl=C3=A8me=20droid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AideDeJeu/AideDeJeu.Android/NativeAPI.cs      |  3 +-
 .../Properties/AndroidManifest.xml            |  4 +-
 .../PlayerCharacterEditorViewModel.cs         | 15 ++++-
 .../Views/PlayerCharacterEditorPage.xaml      | 63 ++++++++++++++-----
 Data/library.ver                              |  2 +-
 5 files changed, 66 insertions(+), 21 deletions(-)

diff --git a/AideDeJeu/AideDeJeu.Android/NativeAPI.cs b/AideDeJeu/AideDeJeu.Android/NativeAPI.cs
index 56c34d96..5e35bc40 100644
--- a/AideDeJeu/AideDeJeu.Android/NativeAPI.cs
+++ b/AideDeJeu/AideDeJeu.Android/NativeAPI.cs
@@ -50,7 +50,8 @@ namespace AideDeJeu.Droid
         }
         public string GetNewFilePath(string fileName, string extension)
         {
-            var documentsDirectoryPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal);
+            //var documentsDirectoryPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal);
+            var documentsDirectoryPath = Android.App.Application.Context.CacheDir.AbsolutePath;
             return Path.Combine(documentsDirectoryPath, $"{fileName}.{extension}");
         }
         public async Task CopyOldToNewFileAsync(string fileName, string extension)
diff --git a/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml b/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml
index 26a125bf..cbe402c2 100644
--- a/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml
+++ b/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="32" android:versionName="1.32" package="com.nioux.aidedejeubeta" android:installLocation="preferExternal">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="32" android:versionName="1.32" package="com.nioux.aidedejeu" android:installLocation="preferExternal">
 	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
 	<uses-permission android:name="android.permission.INTERNET" />
-	<application android:label="Haches &amp; Dés beta" android:icon="@drawable/battle_axe"></application>
+	<application android:label="Haches &amp; Dés" android:icon="@drawable/battle_axe"></application>
 </manifest>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs
index 4f999661..93ddb006 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs
@@ -98,13 +98,22 @@ namespace AideDeJeu.ViewModels
             }
         }
 
+        public List<string> Abilities { get; set; } = new List<string>()
+        {
+            "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18"
+        };
+        public List<string> Levels { get; set; } = new List<string>()
+        {
+            "1", //"2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20"
+        };
+
         public async Task InitAsync()
         {
             using (var context = await StoreViewModel.GetLibraryContextAsync())
             {
-                Races = await context.Races.Where(r => r.GetType() == typeof(RaceItem)).OrderBy(r => r.Name).ToListAsync();
-                Classes = await context.Classes.OrderBy(c => c.Name).ToListAsync();
-                Backgrounds = await context.Backgrounds.Where(b => b.GetType() == typeof(BackgroundItem)).OrderBy(b => b.Name).ToListAsync();
+                Races = await context.Races.Where(r => r.GetType() == typeof(RaceItem)).OrderBy(r => Tools.Helpers.RemoveDiacritics(r.Name)).ToListAsync();
+                Classes = await context.Classes.Where(c => c.GetType() == typeof(ClassItem)).OrderBy(c => Tools.Helpers.RemoveDiacritics(c.Name)).ToListAsync();
+                Backgrounds = await context.Backgrounds.Where(b => b.GetType() == typeof(BackgroundItem)).OrderBy(b => Tools.Helpers.RemoveDiacritics(b.Name)).ToListAsync();
             }
         }
     }
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
index a3f79d2f..c223f3f7 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml
@@ -12,30 +12,65 @@
             <tools:NullToFalseConverter x:Key="NullToFalseConverter" />
         </ResourceDictionary>
     </ContentPage.Resources>
-    <StackLayout Orientation="Vertical">
-        <Label Text="Race" />
-        <Picker ItemsSource="{Binding Races}" ItemDisplayBinding="{Binding Name}" SelectedIndex="{Binding RaceSelectedIndex, Mode=TwoWay}">
-        </Picker>
-        <!--<mdview:MarkdownView 
+    <ScrollView>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Label Grid.Row="0" Grid.Column="0" Text="Niveau" />
+            <Picker Grid.Row="0" Grid.Column="1" ItemsSource="{Binding Levels}" ItemDisplayBinding="{Binding}" />
+            <Label Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Text="Race" />
+            <Picker Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"  ItemsSource="{Binding Races}" ItemDisplayBinding="{Binding Name}" SelectedIndex="{Binding RaceSelectedIndex, Mode=TwoWay}">
+            </Picker>
+            <!--<mdview:MarkdownView 
                     Theme="{StaticResource MonsterMarkdownTheme}" 
                     Markdown="{Binding SelectedPlayerCharacter.Race.Markdown}" 
                     NavigateToLinkCommand="{Binding BindingContext.Main.Navigator.NavigateToLinkCommand, Source={x:Reference This}}"
                     />-->
-        <Label Text="Classe" />
-        <Picker ItemsSource="{Binding Classes}" ItemDisplayBinding="{Binding Name}"  SelectedIndex="{Binding ClassSelectedIndex, Mode=TwoWay}">
-        </Picker>
-        <!--<mdview:MarkdownView 
+            <Label Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Text="Classe" />
+            <Picker Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding Classes}" ItemDisplayBinding="{Binding Name}"  SelectedIndex="{Binding ClassSelectedIndex, Mode=TwoWay}">
+            </Picker>
+            <!--<mdview:MarkdownView 
                     Theme="{StaticResource MonsterMarkdownTheme}" 
                     Markdown="{Binding SelectedPlayerCharacter.Class.Markdown}" 
                     NavigateToLinkCommand="{Binding BindingContext.Main.Navigator.NavigateToLinkCommand, Source={x:Reference This}}"
                     />-->
-        <Label Text="Historique" />
-        <Picker ItemsSource="{Binding Backgrounds}" ItemDisplayBinding="{Binding Name}" SelectedIndex="{Binding BackgroundSelectedIndex, Mode=TwoWay}">
-        </Picker>
-        <!--<mdview:MarkdownView 
+            <Label Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" Text="Historique" />
+            <Picker Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding Backgrounds}" ItemDisplayBinding="{Binding Name}" SelectedIndex="{Binding BackgroundSelectedIndex, Mode=TwoWay}">
+            </Picker>
+            <!--<mdview:MarkdownView 
                     Theme="{StaticResource MonsterMarkdownTheme}" 
                     Markdown="{Binding SelectedPlayerCharacter.Background.Markdown}" 
                     NavigateToLinkCommand="{Binding BindingContext.Main.Navigator.NavigateToLinkCommand, Source={x:Reference This}}"
                     />-->
-    </StackLayout>
+            <Label Grid.Row="7" Grid.Column="0" Text="Force" />
+            <Picker Grid.Row="7" Grid.Column="1" ItemsSource="{Binding Abilities}" ItemDisplayBinding="{Binding}" />
+            <Label Grid.Row="8" Grid.Column="0" Text="Dextérité" />
+            <Picker Grid.Row="8" Grid.Column="1" ItemsSource="{Binding Abilities}" ItemDisplayBinding="{Binding}" />
+            <Label Grid.Row="9" Grid.Column="0" Text="Constitution" />
+            <Picker Grid.Row="9" Grid.Column="1" ItemsSource="{Binding Abilities}" ItemDisplayBinding="{Binding}" />
+            <Label Grid.Row="10" Grid.Column="0" Text="Intelligence" />
+            <Picker Grid.Row="10" Grid.Column="1" ItemsSource="{Binding Abilities}" ItemDisplayBinding="{Binding}" />
+            <Label Grid.Row="11" Grid.Column="0" Text="Sagesse" />
+            <Picker Grid.Row="11" Grid.Column="1" ItemsSource="{Binding Abilities}" ItemDisplayBinding="{Binding}" />
+            <Label Grid.Row="12" Grid.Column="0" Text="Charisme" />
+            <Picker Grid.Row="12" Grid.Column="1" ItemsSource="{Binding Abilities}" ItemDisplayBinding="{Binding}" />
+        </Grid>
+    </ScrollView>
 </ContentPage>
\ No newline at end of file
diff --git a/Data/library.ver b/Data/library.ver
index da2d3988..3f10ffe7 100644
--- a/Data/library.ver
+++ b/Data/library.ver
@@ -1 +1 @@
-14
\ No newline at end of file
+15
\ No newline at end of file