Merge branch 'master' of https://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="2" android:versionName="1.1" package="com.uca.thegameextreme" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
-	<application android:label="TheGameExtreme.Android" android:icon="@drawable/iconpique"></application>
+	<application android:label="TheGameExtreme.Android" android:icon="@drawable/TrierImageB"></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>
-//     This code was generated by a tool.
+//     Ce code a été généré par un outil.
-//     Runtime Version:4.0.30319.42000
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
-//     the code is regenerated.
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -5821,7 +5821,7 @@ namespace TheGameExtreme.Droid
 			public const int tooltip_frame_light = 2131165310;
 			
 			// aapt resource value: 0x7F07007F
-			public const int TrierImage = 2131165311;
+			public const int TrierImageB = 2131165311;
 			
 			// aapt resource value: 0x7F070080
 			public const int UsersExiticon = 2131165312;

TheGameExtreme.Android/TheGameExtreme.Android.csproj

@@ -34,7 +34,7 @@
     <MandroidI18n />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
+    <DebugSymbols>false</DebugSymbols>
     <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
@@ -42,6 +42,10 @@
     <WarningLevel>4</WarningLevel>
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <AndroidLinkMode>Full</AndroidLinkMode>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+    <MandroidI18n />
+    <AndroidSupportedAbis />
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
@@ -75,8 +79,10 @@
     <AndroidResource Include="Resources\drawable\FontStyle\IndieFlower.ttf" />
     <AndroidResource Include="Resources\drawable\FontStyle\LicenceFont.pdf" />
     <AndroidResource Include="Resources\drawable\IconPique.ico">
-      <SubType></SubType>
+      <SubType>
-      <Generator></Generator>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
   </ItemGroup>
   <ItemGroup>
@@ -140,7 +146,13 @@
     <AndroidResource Include="Resources\drawable\HomeIcon.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable\TrierImage.ico" />
+    <AndroidResource Include="Resources\TrierImageB.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\TrierImageB.png">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

TheGameExtreme.iOS/TheGameExtreme.iOS.csproj

@@ -64,7 +64,7 @@
     <AppExtensionDebugBundleId />
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>IconPique.ico</ApplicationIcon>
+    <ApplicationIcon>TrierImageB.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
@@ -170,4 +170,10 @@
     <BundleResource Include="Resources\HomeIcon.png" />
     <BundleResource Include="Resources\TrierImage.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\TrierImageB.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="TrierImageB.ico" />
+  </ItemGroup>
 </Project>