Double build ok

AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj

@@ -12,12 +12,12 @@
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <ReleaseVersion>1.38</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -33,13 +33,16 @@
     <BundleAssemblies>false</BundleAssemblies>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
     <MandroidI18n>West</MandroidI18n>
+	<MainLogo>battle_axe</MainLogo>
+	<LibraryName>library</LibraryName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_JoA|AnyCPU'">
+    <AndroidManifest>Properties\AndroidManifest.JoA.xml</AndroidManifest>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug_JoA</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
+    <DefineConstants>DEBUG;CONFIG_JOA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
@@ -50,8 +53,11 @@
     <BundleAssemblies>false</BundleAssemblies>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
     <MandroidI18n>West</MandroidI18n>
+	<MainLogo>high_shot</MainLogo>
+	<LibraryName>library_JoA</LibraryName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <DebugSymbols>false</DebugSymbols>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
@@ -74,12 +80,16 @@
     <AndroidDexTool>d8</AndroidDexTool>
     <AndroidLinkTool>r8</AndroidLinkTool>
     <MandroidI18n>West</MandroidI18n>
+	<MainLogo>battle_axe</MainLogo>
+	<LibraryName>library</LibraryName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_JoA|AnyCPU'">
+    <AndroidManifest>Properties\AndroidManifest.JoA.xml</AndroidManifest>
     <DebugSymbols>false</DebugSymbols>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release_JoA</OutputPath>
+    <DefineConstants>CONFIG_JOA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
@@ -98,6 +108,8 @@
     <AndroidDexTool>d8</AndroidDexTool>
     <AndroidLinkTool>r8</AndroidLinkTool>
     <MandroidI18n>West</MandroidI18n>
+	<MainLogo>high_shot</MainLogo>
+	<LibraryName>library_JoA</LibraryName>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
@@ -181,30 +193,15 @@
     <AndroidAsset Include="Assets\LinLibertine_DR.ttf" />
     <AndroidAsset Include="Assets\LinLibertine_I.ttf" />
   </ItemGroup>
-	<Choose>
-		<When Condition="'$(Configuration)' == 'Debug_JoA'">
-		  <ItemGroup>
-			<EmbeddedResource Include="..\..\Data\library_JoA.db">
-			  <Link>library.db</Link>
-			</EmbeddedResource>
-		  </ItemGroup>
-		</When>
-		<When Condition="'$(Configuration)' == 'Release_JoA'">
-		  <ItemGroup>
-			<EmbeddedResource Include="..\..\Data\library_JoA.db">
-			  <Link>library.db</Link>
-			</EmbeddedResource>
-		  </ItemGroup>
-		</When>
-		<Otherwise>
-		  <ItemGroup>
-			<EmbeddedResource Include="..\..\Data\library.db">
-			  <Link>library.db</Link>
-			</EmbeddedResource>
-		  </ItemGroup>
-		</Otherwise>
-	</Choose>
   <ItemGroup>
+	<AndroidAsset Include="..\..\Data\$(LibraryName).db">
+	  <Link>Assets\library.db</Link>
+	</AndroidAsset>
+  </ItemGroup>
+  <ItemGroup>
+	<AndroidResource Include="..\..\Data\Icons\Resources\drawable\$(MainLogo).png">
+	  <Link>Resources\drawable\main.png</Link>
+	</AndroidResource>
     <AndroidAsset Include="..\..\Data\library.ver">
       <Link>Assets\library.ver</Link>
     </AndroidAsset>
@@ -227,14 +224,9 @@
     <AndroidResource Include="Resources\font\cinzeldecorative_bold.otf" />
     <AndroidResource Include="Resources\font\cinzeldecorative_regular.otf" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\icon.png" />
-    <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
-    <AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
-    <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="Properties\AndroidManifest.xml" />
+    <None Include="Properties\AndroidManifest.JoA.xml" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\layout\Tabbar.axml" />
@@ -249,27 +241,9 @@
       <Name>AideDeJeu</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\ic_home.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\splash.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\ic_launcher.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-mdpi\ic_launcher.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\ic_launcher.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\ic_launcher.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\ic_launcher.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\crystal_ball.png" />
   </ItemGroup>
@@ -561,6 +535,18 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxhdpi\speaker_off.png" />
   </ItemGroup>
+  <!--<ItemGroup>
+    <AndroidResource Include="Resources\drawable\high_shot.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\high_shot.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\high_shot.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\high_shot.png" />
+  </ItemGroup>--> 
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\battle_axe_.xml" />
   </ItemGroup>
@@ -576,5 +562,9 @@
   <ItemGroup>
     <AndroidResource Include="Resources\xml\searchable.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\drawable-mdpi\" />
+    <Folder Include="Resources\drawable-xxxhdpi\" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

AideDeJeu/AideDeJeu.Android/MainActivity.cs

@@ -14,7 +14,11 @@ namespace AideDeJeu.Droid
 {
     [IntentFilter(new[] { Android.Content.Intent.ActionAssist }, Categories = new[] { Android.Content.Intent.CategoryDefault })]
     //[Activity(Label = "Aide de Jeu", Icon = "@drawable/black_book", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+#if CONFIG_JOA
+    [Activity(Name = "com.nioux.aidedejeu.joa.MainActivity", Label = "Arc & Dés", Icon = "@drawable/main", Theme = "@style/MyTheme.Splash", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+#else
     [Activity(Name = "com.nioux.aidedejeu.MainActivity", Label = "Haches & Dés", Icon = "@drawable/battle_axe", Theme = "@style/MyTheme.Splash", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+#endif
     public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
         protected override void OnCreate(Bundle bundle)
@@ -32,7 +36,7 @@ namespace AideDeJeu.Droid
 
             Xamarin.Essentials.Platform.Init(this, bundle);
             Xamarin.Forms.Forms.SetFlags("CollectionView_Experimental");
-            Xamarin.Essentials.ExperimentalFeatures.Enable(Xamarin.Essentials.ExperimentalFeatures.ShareFileRequest);
+            //Xamarin.Essentials.ExperimentalFeatures.Enable(Xamarin.Essentials.ExperimentalFeatures.ShareFileRequest);
 
             Rg.Plugins.Popup.Popup.Init(this, bundle);
 
@@ -205,7 +209,11 @@ namespace AideDeJeu.Droid
 
     [IntentFilter(new[] { Android.Content.Intent.ActionAssist }, Categories = new[] { Android.Content.Intent.CategoryDefault })]
     //[Activity(Label = "Aide de Jeu", Icon = "@drawable/black_book", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
-    [Activity(Name = "com.nioux.aidedejeu.SearchActivity", Label = "Aide de Jeu")]
+#if CONFIG_JOA
+    [Activity(Name = "com.nioux.aidedejeu.joa.SearchActivity", Label = "Arc et dés")]
+#else
+    [Activity(Name = "com.nioux.aidedejeu.SearchActivity", Label = "Haches et dés")]
+#endif
     public class SearchActivity : Android.App.Activity // global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
         protected override void OnCreate(Bundle bundle)

AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.JoA.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nioux.aidedejeu.joa" android:installLocation="internalOnly" android:versionCode="14002" android:versionName="1.40.02">
+	<uses-sdk android:targetSdkVersion="28" android:minSdkVersion="16" />
+	<application android:label="Arc &amp; Dés">
+		<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.nioux.aidedejeu.joa.fileprovider" android:exported="false" android:grantUriPermissions="true">
+			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"></meta-data>
+		</provider>
+		<activity android:name=".SearchActivity" android:label="Aide de Jeu">
+			<intent-filter>
+				<action android:name="com.google.android.gms.actions.SEARCH_ACTION" />
+				<category android:name="android.intent.category.DEFAULT" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.SEARCH" />
+			</intent-filter>
+			<meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
+		</activity>
+	</application>
+</manifest>

AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs

@@ -8389,122 +8389,116 @@ namespace AideDeJeu.Droid
 			// aapt resource value: 0x7F07006E
 			public const int funnel = 2131165294;
 			
-			// aapt resource value: 0x7F070074
-			public const int icon = 2131165300;
-			
 			// aapt resource value: 0x7F07006F
-			public const int ic_home = 2131165295;
+			public const int ic_mtrl_chip_checked_black = 2131165295;
 			
 			// aapt resource value: 0x7F070070
-			public const int ic_launcher = 2131165296;
+			public const int ic_mtrl_chip_checked_circle = 2131165296;
 			
 			// aapt resource value: 0x7F070071
-			public const int ic_mtrl_chip_checked_black = 2131165297;
+			public const int ic_mtrl_chip_close_circle = 2131165297;
 			
 			// aapt resource value: 0x7F070072
-			public const int ic_mtrl_chip_checked_circle = 2131165298;
+			public const int main = 2131165298;
 			
 			// aapt resource value: 0x7F070073
-			public const int ic_mtrl_chip_close_circle = 2131165299;
+			public const int MaterialActivityIndicatorBackground = 2131165299;
+			
+			// aapt resource value: 0x7F070074
+			public const int MaterialProgressBar = 2131165300;
 			
 			// aapt resource value: 0x7F070075
-			public const int MaterialActivityIndicatorBackground = 2131165301;
+			public const int mtrl_snackbar_background = 2131165301;
 			
 			// aapt resource value: 0x7F070076
-			public const int MaterialProgressBar = 2131165302;
+			public const int mtrl_tabs_default_indicator = 2131165302;
 			
 			// aapt resource value: 0x7F070077
-			public const int mtrl_snackbar_background = 2131165303;
+			public const int navigation_empty_icon = 2131165303;
 			
 			// aapt resource value: 0x7F070078
-			public const int mtrl_tabs_default_indicator = 2131165304;
+			public const int notification_action_background = 2131165304;
 			
 			// aapt resource value: 0x7F070079
-			public const int navigation_empty_icon = 2131165305;
+			public const int notification_bg = 2131165305;
 			
 			// aapt resource value: 0x7F07007A
-			public const int notification_action_background = 2131165306;
+			public const int notification_bg_low = 2131165306;
 			
 			// aapt resource value: 0x7F07007B
-			public const int notification_bg = 2131165307;
+			public const int notification_bg_low_normal = 2131165307;
 			
 			// aapt resource value: 0x7F07007C
-			public const int notification_bg_low = 2131165308;
+			public const int notification_bg_low_pressed = 2131165308;
 			
 			// aapt resource value: 0x7F07007D
-			public const int notification_bg_low_normal = 2131165309;
+			public const int notification_bg_normal = 2131165309;
 			
 			// aapt resource value: 0x7F07007E
-			public const int notification_bg_low_pressed = 2131165310;
+			public const int notification_bg_normal_pressed = 2131165310;
 			
 			// aapt resource value: 0x7F07007F
-			public const int notification_bg_normal = 2131165311;
+			public const int notification_icon_background = 2131165311;
 			
 			// aapt resource value: 0x7F070080
-			public const int notification_bg_normal_pressed = 2131165312;
+			public const int notification_template_icon_bg = 2131165312;
 			
 			// aapt resource value: 0x7F070081
-			public const int notification_icon_background = 2131165313;
+			public const int notification_template_icon_low_bg = 2131165313;
 			
 			// aapt resource value: 0x7F070082
-			public const int notification_template_icon_bg = 2131165314;
+			public const int notification_tile_bg = 2131165314;
 			
 			// aapt resource value: 0x7F070083
-			public const int notification_template_icon_low_bg = 2131165315;
+			public const int notify_panel_notification_icon_bg = 2131165315;
 			
 			// aapt resource value: 0x7F070084
-			public const int notification_tile_bg = 2131165316;
+			public const int plain_arrow_down = 2131165316;
 			
 			// aapt resource value: 0x7F070085
-			public const int notify_panel_notification_icon_bg = 2131165317;
+			public const int plain_arrow_up = 2131165317;
 			
 			// aapt resource value: 0x7F070086
-			public const int plain_arrow_down = 2131165318;
+			public const int rolling_dice_cup = 2131165318;
 			
 			// aapt resource value: 0x7F070087
-			public const int plain_arrow_up = 2131165319;
+			public const int round_star = 2131165319;
 			
 			// aapt resource value: 0x7F070088
-			public const int rolling_dice_cup = 2131165320;
+			public const int scroll_unfurled = 2131165320;
 			
 			// aapt resource value: 0x7F070089
-			public const int round_star = 2131165321;
+			public const int settings_knobs = 2131165321;
 			
 			// aapt resource value: 0x7F07008A
-			public const int scroll_unfurled = 2131165322;
+			public const int share = 2131165322;
 			
 			// aapt resource value: 0x7F07008B
-			public const int settings_knobs = 2131165323;
+			public const int speaker = 2131165323;
 			
 			// aapt resource value: 0x7F07008C
-			public const int share = 2131165324;
+			public const int speaker_off = 2131165324;
 			
 			// aapt resource value: 0x7F07008D
-			public const int speaker = 2131165325;
+			public const int spell_book = 2131165325;
 			
 			// aapt resource value: 0x7F07008E
-			public const int speaker_off = 2131165326;
+			public const int splash = 2131165326;
 			
 			// aapt resource value: 0x7F07008F
-			public const int spell_book = 2131165327;
+			public const int stars_stack = 2131165327;
 			
 			// aapt resource value: 0x7F070090
-			public const int splash = 2131165328;
+			public const int tooltip_frame_dark = 2131165328;
 			
 			// aapt resource value: 0x7F070091
-			public const int stars_stack = 2131165329;
+			public const int tooltip_frame_light = 2131165329;
 			
 			// aapt resource value: 0x7F070092
-			public const int tooltip_frame_dark = 2131165330;
+			public const int trash_can = 2131165330;
 			
 			// aapt resource value: 0x7F070093
-			public const int tooltip_frame_light = 2131165331;
-			
-			// aapt resource value: 0x7F070094
-			public const int trash_can = 2131165332;
-			
-			// aapt resource value: 0x7F070095
-			public const int wooden_sign = 2131165333;
+			public const int wooden_sign = 2131165331;
 			
 			static Drawable()
 			{

AideDeJeu/AideDeJeu.Android/Resources/drawable/splash.xml

@@ -5,7 +5,7 @@
   </item>
   <item>
     <bitmap
-      android:src="@drawable/battle_axe"
+      android:src="@drawable/main"
       android:tileMode="disabled"
       android:gravity="center" 
     />

AideDeJeu/AideDeJeu.GTK/Program.cs

@@ -20,7 +20,7 @@ namespace AideDeJeu.GTK
             var app = new App();
             var window = new FormsWindow();
             window.LoadApplication(app);
-            window.SetApplicationIcon("battle_axe.png");
+            window.SetApplicationIcon("main.png");
             window.SetApplicationTitle("Haches & Dés");
             window.Show();
 

AideDeJeu/AideDeJeu/Views/AboutPage.xaml

@@ -20,7 +20,7 @@
         <StackLayout VerticalOptions="FillAndExpand" HorizontalOptions="Fill">
             <StackLayout Orientation="Horizontal" HorizontalOptions="Center" VerticalOptions="Center">
                 <ContentView Padding="20,20,20,20" VerticalOptions="FillAndExpand">
-                  <Image VerticalOptions="Center" HeightRequest="64" Source="battle_axe.png" />
+                  <Image VerticalOptions="Center" HeightRequest="64" Source="main.png" />
                 </ContentView>
             </StackLayout>
         </StackLayout>

AideDeJeu/AideDeJeu/Views/MainPage.xaml

@@ -93,7 +93,7 @@
                 <Frame>
                     <Grid>
                         <Label Text="Personnages" FontFamily="{StaticResource LinuxLibertineCapitals}" />
-                        <ImageButton Source="battle_axe.png" Command="{Binding Main.Navigator.PlayerCharacterEditorCommand, Mode=OneTime}" />
+                        <ImageButton Source="main.png" Command="{Binding Main.Navigator.PlayerCharacterEditorCommand, Mode=OneTime}" />
                     </Grid>
                 </Frame>
                 <Frame>

AideDeJeu/AideDeJeu/Views/MainShell.xaml

@@ -139,7 +139,7 @@
 
     <ShellContent Title="Accueil" Route="home" ContentTemplate="{DataTemplate local:MainPage}" />
     <!--<ShellContent Title="Personnages" Route="pceditor" Icon="battle_axe.png" ContentTemplate="{DataTemplate pc:PlayerCharacterEditorPage}" />-->
-    <FlyoutItem Title="Personnages" Route="pceditor" Icon="battle_axe.png">
+    <FlyoutItem Title="Personnages" Route="pceditor" Icon="main.png">
         <Tab Title="Personnages">
             <ShellContent Title="Race" ContentTemplate="{DataTemplate pc:RacePage}" />
             <ShellContent Title="Historique" ContentTemplate="{DataTemplate pc:BackgroundPage}" />