mirror of
				https://github.com/Nioux/AideDeJeu.git
				synced 2025-10-29 22:45:44 +00:00 
			
		
		
		
	Merge branch 'master' of https://github.com/Nioux/AideDeJeu
This commit is contained in:
		
						commit
						aa8998e1b5
					
				
					 12 changed files with 298 additions and 2 deletions
				
			
		|  | @ -96,6 +96,7 @@ | |||
|     <BundleResource Include="Resources\Fonts\LinLibertine_R.ttf"> | ||||
|       <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||||
|     </BundleResource> | ||||
|     <Compile Include="NativeAPI.cs" /> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <BundleResource Include="Resources\Icon-60%403x.png" /> | ||||
|  | @ -114,7 +115,7 @@ | |||
|       <Version>1.60.0</Version> | ||||
|     </PackageReference> | ||||
|     <PackageReference Include="Xamarin.Forms"> | ||||
|       <Version>3.0.0.446417</Version> | ||||
|       <Version>3.0.0.482510</Version> | ||||
|     </PackageReference> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|  | @ -149,6 +150,10 @@ | |||
|       <Project>{C0597D88-5C09-4314-80A3-64712B02D0E9}</Project> | ||||
|       <Name>AideDeJeu</Name> | ||||
|     </ProjectReference> | ||||
|     <ProjectReference Include="..\AideDeJeuLib\AideDeJeuLib.csproj"> | ||||
|       <Project>{948BB32D-BAB8-485D-8A6F-BE5391E824A3}</Project> | ||||
|       <Name>AideDeJeuLib</Name> | ||||
|     </ProjectReference> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <ImageAsset Include="Media.xcassets\Contents.json"> | ||||
|  | @ -202,9 +207,18 @@ | |||
|     <ImageAsset Include="Media.xcassets\icon.imageset\black-book.pdf"> | ||||
|       <Visible>false</Visible> | ||||
|     </ImageAsset> | ||||
|     <ImageAsset Include="Media.xcassets\spell_book.imageset\Contents.json" /> | ||||
|     <ImageAsset Include="Media.xcassets\dragon_head.imageset\Contents.json" /> | ||||
|     <ImageAsset Include="Media.xcassets\wooden_sign.imageset\Contents.json" /> | ||||
|     <ImageAsset Include="Media.xcassets\dragon_head.imageset\dragon_head.png" /> | ||||
|     <ImageAsset Include="Media.xcassets\spell_book.imageset\spell_book.png" /> | ||||
|     <ImageAsset Include="Media.xcassets\wooden_sign.imageset\wooden_sign.png" /> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <Folder Include="Media.xcassets\icon.imageset\" /> | ||||
|     <Folder Include="Media.xcassets\spell_book.imageset\" /> | ||||
|     <Folder Include="Media.xcassets\dragon_head.imageset\" /> | ||||
|     <Folder Include="Media.xcassets\wooden_sign.imageset\" /> | ||||
|   </ItemGroup> | ||||
|   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> | ||||
| </Project> | ||||
							
								
								
									
										83
									
								
								AideDeJeu/AideDeJeu.iOS/Media.xcassets/dragon_head.imageset/Contents.json
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										83
									
								
								AideDeJeu/AideDeJeu.iOS/Media.xcassets/dragon_head.imageset/Contents.json
									
										
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -0,0 +1,83 @@ | |||
| { | ||||
|   "images": [ | ||||
|     { | ||||
|       "idiom": "universal" | ||||
|     }, | ||||
|     { | ||||
|       "scale": "1x", | ||||
|       "idiom": "universal" | ||||
|     }, | ||||
|     { | ||||
|       "scale": "2x", | ||||
|       "idiom": "universal" | ||||
|     }, | ||||
|     { | ||||
|       "filename": "dragon_head.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" | ||||
|     } | ||||
|   ], | ||||
|   "info": { | ||||
|     "version": 1, | ||||
|     "author": "xcode" | ||||
|   } | ||||
| } | ||||
							
								
								
									
										
											BIN
										
									
								
								AideDeJeu/AideDeJeu.iOS/Media.xcassets/dragon_head.imageset/dragon_head.png
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								AideDeJeu/AideDeJeu.iOS/Media.xcassets/dragon_head.imageset/dragon_head.png
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 4.6 KiB | 
							
								
								
									
										83
									
								
								AideDeJeu/AideDeJeu.iOS/Media.xcassets/spell_book.imageset/Contents.json
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										83
									
								
								AideDeJeu/AideDeJeu.iOS/Media.xcassets/spell_book.imageset/Contents.json
									
										
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -0,0 +1,83 @@ | |||
| { | ||||
|   "images": [ | ||||
|     { | ||||
|       "idiom": "universal" | ||||
|     }, | ||||
|     { | ||||
|       "scale": "1x", | ||||
|       "idiom": "universal" | ||||
|     }, | ||||
|     { | ||||
|       "scale": "2x", | ||||
|       "idiom": "universal" | ||||
|     }, | ||||
|     { | ||||
|       "filename": "spell_book.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" | ||||
|     } | ||||
|   ], | ||||
|   "info": { | ||||
|     "version": 1, | ||||
|     "author": "xcode" | ||||
|   } | ||||
| } | ||||
							
								
								
									
										
											BIN
										
									
								
								AideDeJeu/AideDeJeu.iOS/Media.xcassets/spell_book.imageset/spell_book.png
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								AideDeJeu/AideDeJeu.iOS/Media.xcassets/spell_book.imageset/spell_book.png
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 4.3 KiB | 
							
								
								
									
										83
									
								
								AideDeJeu/AideDeJeu.iOS/Media.xcassets/wooden_sign.imageset/Contents.json
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										83
									
								
								AideDeJeu/AideDeJeu.iOS/Media.xcassets/wooden_sign.imageset/Contents.json
									
										
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -0,0 +1,83 @@ | |||
| { | ||||
|   "images": [ | ||||
|     { | ||||
|       "idiom": "universal" | ||||
|     }, | ||||
|     { | ||||
|       "scale": "1x", | ||||
|       "idiom": "universal" | ||||
|     }, | ||||
|     { | ||||
|       "scale": "2x", | ||||
|       "idiom": "universal" | ||||
|     }, | ||||
|     { | ||||
|       "filename": "wooden_sign.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" | ||||
|     } | ||||
|   ], | ||||
|   "info": { | ||||
|     "version": 1, | ||||
|     "author": "xcode" | ||||
|   } | ||||
| } | ||||
							
								
								
									
										
											BIN
										
									
								
								AideDeJeu/AideDeJeu.iOS/Media.xcassets/wooden_sign.imageset/wooden_sign.png
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								AideDeJeu/AideDeJeu.iOS/Media.xcassets/wooden_sign.imageset/wooden_sign.png
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 1.6 KiB | 
							
								
								
									
										32
									
								
								AideDeJeu/AideDeJeu.iOS/NativeAPI.cs
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								AideDeJeu/AideDeJeu.iOS/NativeAPI.cs
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,32 @@ | |||
| using AideDeJeu.Tools; | ||||
| using System; | ||||
| using System.IO; | ||||
| using Foundation; | ||||
| 
 | ||||
| [assembly: Xamarin.Forms.Dependency(typeof(AideDeJeu.Droid.Version_Android))] | ||||
| namespace AideDeJeu.Droid | ||||
| { | ||||
| 	public class Version_Android : INativeAPI | ||||
| 	{ | ||||
| 		public string GetVersion() | ||||
| 		{ | ||||
| 
 | ||||
| 			return NSBundle.MainBundle.InfoDictionary[new NSString("CFBundleShortVersionString")].ToString(); | ||||
| 		} | ||||
| 
 | ||||
| 		public int GetBuild() | ||||
| 		{ | ||||
| 			var buildVersion = NSBundle.MainBundle.InfoDictionary[new NSString("CFBundleVersion")].ToString(); | ||||
| 			int build = 0; | ||||
| 			var res = int.TryParse(buildVersion, out build); | ||||
| 			return res ? build : 0; | ||||
| 		} | ||||
| 
 | ||||
| 		public string GetDatabasePath(string databaseName) | ||||
| 		{ | ||||
| 			SQLitePCL.Batteries_V2.Init(); | ||||
| 			var databasePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "..", "Library", databaseName); | ||||
| 			return databasePath; | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
|  | @ -5,7 +5,8 @@ | |||
|   </PropertyGroup> | ||||
| 
 | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="HtmlAgilityPack" Version="1.8.1" /> | ||||
|     <PackageReference Include="HtmlAgilityPack" Version="1.8.2" /> | ||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.0.3" /> | ||||
|   </ItemGroup> | ||||
| 
 | ||||
|   <ItemGroup> | ||||
|  |  | |||
							
								
								
									
										
											BIN
										
									
								
								Data/dragon-head.pdf
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Data/dragon-head.pdf
									
										
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Data/spell-book.pdf
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Data/spell-book.pdf
									
										
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Data/wooden-sign.pdf
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Data/wooden-sign.pdf
									
										
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Yan Maniez
						Yan Maniez