Merge branch 'master' of gitlab.iut-clermont.uca.fr:cldupland/thegameextreme

TheGameExtreme.Android/Properties/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.uca.thegameextreme" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
-	<application android:label="TheGameExtreme.Android" android:icon="@drawable/Apple"></application>
+	<application android:label="TheGameExtreme.Android" android:icon="@drawable/iconpique"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

TheGameExtreme.Android/Resources/Resource.designer.cs

@@ -1,11 +1,11 @@
 #pragma warning disable 1591
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Ce code a été généré par un outil.
+//     This code was generated by a tool.
-//     Version du runtime :4.0.30319.42000
+//     Runtime Version:4.0.30319.42000
 //
-//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     Changes to this file may cause incorrect behavior and will be lost if
-//     le code est régénéré.
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

TheGameExtreme.Android/TheGameExtreme.Android.csproj

@@ -74,6 +74,10 @@
     <None Include="Properties\AndroidManifest.xml" />
     <AndroidResource Include="Resources\drawable\FontStyle\IndieFlower.ttf" />
     <AndroidResource Include="Resources\drawable\FontStyle\LicenceFont.pdf" />
+    <AndroidResource Include="Resources\drawable\IconPique.ico">
+      <SubType></SubType>
+      <Generator></Generator>
+    </AndroidResource>
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\layout\Tabbar.xml" />

TheGameExtreme.iOS/Resources/AndroidManifest.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.uca.thegameextreme" android:installLocation="auto">
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+  <application android:label="TheGameExtreme.Android" android:icon="@drawable/IconPique.jpg" android:name="android.app.Application" android:allowBackup="true" android:debuggable="true">
+    <activity android:configChanges="orientation|screenSize" android:label="TheGameExtreme" android:screenOrientation="landscape" android:theme="@style/MainTheme" android:name="md5c076201c8182e8540d3c086a8691f158.MainActivity">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+    <service android:name="md5dcb6eccdc824e0677ffae8ccdde42930.KeepAliveService" />
+    <receiver android:enabled="true" android:exported="false" android:label="Essentials Battery Broadcast Receiver" android:name="md5d630c3d3bfb5f5558520331566132d97.BatteryBroadcastReceiver" />
+    <receiver android:enabled="true" android:exported="false" android:label="Essentials Energy Saver Broadcast Receiver" android:name="md5d630c3d3bfb5f5558520331566132d97.EnergySaverBroadcastReceiver" />
+    <receiver android:enabled="true" android:exported="false" android:label="Essentials Connectivity Broadcast Receiver" android:name="md5d630c3d3bfb5f5558520331566132d97.ConnectivityBroadcastReceiver" />
+    <provider android:authorities="com.uca.thegameextreme.fileProvider" android:exported="false" android:grantUriPermissions="true" android:name="xamarin.essentials.fileProvider">
+      <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/xamarin_essentials_fileprovider_file_paths" />
+    </provider>
+    <receiver android:enabled="true" android:exported="false" android:name="md51558244f76c53b6aeda52c8a337f2c37.PowerSaveModeBroadcastReceiver" />
+    <provider android:name="mono.MonoRuntimeProvider" android:exported="false" android:initOrder="1999999999" android:authorities="com.uca.thegameextreme.mono.MonoRuntimeProvider.__mono_init__" />
+    <!--suppress ExportedReceiver-->
+    <receiver android:name="mono.android.Seppuku">
+      <intent-filter>
+        <action android:name="mono.android.intent.action.SEPPUKU" />
+        <category android:name="mono.android.intent.category.SEPPUKU.com.uca.thegameextreme" />
+      </intent-filter>
+    </receiver>
+  </application>
+</manifest>

TheGameExtreme.iOS/TheGameExtreme.iOS.csproj

@@ -14,6 +14,7 @@
     <AssemblyName>TheGameExtreme.iOS</AssemblyName>
     <MtouchEnableSGenConc>true</MtouchEnableSGenConc>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
+    <ApplicationIcon>Resources\IconPique.jpg</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -77,6 +78,7 @@
     <BundleResource Include="Resources\Apple.png">
       <LogicalName>TheGameExtreme.iOS.Resources.Apple.png</LogicalName>
     </BundleResource>
+    <BundleResource Include="Resources\IconPique.ico" />
   </ItemGroup>
   <ItemGroup>
     <InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
@@ -161,7 +163,6 @@
     <BundleResource Include="Resources\rules.png" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Apple.ico" />
     <BundleResource Include="Resources\ArrowSettingsBack.png" />
     <BundleResource Include="Resources\UsersExiticon.png" />
     <BundleResource Include="Resources\HomeIcon.png" />

TheGameExtreme/AppRessource.resx

@@ -159,7 +159,7 @@
     <value>
     - L'objectif est de battre la machine seul et/ou en coopération.
 
-    - Afin d'atteindre l'objectif, les joueurs disposent de 4 piles (par defaut): deux ascendantes(↑) et deux descendantes(↓).
+    - Afin d'atteindre l'objectif, les joueurs disposent de 4 piles (par defaut): deux ascendantes(Verte) et deux descendantes(Rouge).
       Sur les piles ascendantes, le joueur doit bien entendu poser des cartes plus grandes et inversement sur les piles descendantes.
 
     - Le but est de poser les 98 cartes du jeu sur les différentes piles à votre disposition.

TheGameExtreme/TheGameExtreme.csproj

@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="4.6.0" />
+    <PackageReference Include="System.Drawing.Common" Version="4.6.1" />
-    <PackageReference Include="Xamarin.Forms" Version="4.3.0.947036" />
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.991211" />
     <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.0" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.1" />
     <PackageReference Include="TouchTracking.Forms" Version="1.1.0" />
   </ItemGroup>
   <ItemGroup>

TheGameExtreme/view/GamePreparationPage.xaml.cs

@@ -8,7 +8,7 @@ namespace TheGameExtreme.view
     public partial class GamePreparationPage : ContentPage
     {
         public List<int> listNbPlayer = new List<int> { 1, 2, 3, 4, 5 };
-        public List<string> listGameMode = new List<string> { "entières",  "relatives", "décimales", "dizaine", "centaine", "millième", "fractionnées" };
+        public List<string> listGameMode = new List<string> { "entières",  "relatives", "décimales", "dizaines", "centaines", "millièmes" }; // , "fractionnées"
         public List<int> listNbStack = new List<int> { 4, 6, 8 };
  
 

TheGameExtreme/view/TouchManipulationBitmap.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using SkiaSharp;
 using TouchTracking;
 
@@ -15,7 +16,11 @@ namespace TheGameExtreme.view
         {
             this.textPaint = textPaint;
             Value = value.ToString();
-            if (value > -10 && value < 10)
+            if (value < 0 && value > -10)
+            {
+                Value = "-0" + Math.Abs(value).ToString();
+            }
+            else if (value >= 0 && value < 10 && !(value > 0 && value < 1))
             {
                 Value = "0" + value.ToString();
             }