Images iOS

AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj

@@ -219,36 +219,81 @@
     <ImageAsset Include="Media.xcassets\icon.imageset\black-book.pdf">
       <Visible>false</Visible>
     </ImageAsset>
-    <ImageAsset Include="Media.xcassets\wooden_sign.imageset\Contents.json">
+	
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Media.xcassets\stars_stack.imageset\Contents.json">
-      <Visible>false</Visible>
-    </ImageAsset>
     <ImageAsset Include="Media.xcassets\crystal_ball.imageset\Contents.json">
       <Visible>false</Visible>
     </ImageAsset>
+    <ImageAsset Include="Media.xcassets\funnel.imageset\Contents.json">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\plain_arrow_down.imageset\Contents.json">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\plain_arrow_up.imageset\Contents.json">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\round_star.imageset\Contents.json">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\settings_knobs.imageset\Contents.json">
+      <Visible>false</Visible>
+    </ImageAsset>
     <ImageAsset Include="Media.xcassets\spell_book.imageset\Contents.json">
       <Visible>false</Visible>
     </ImageAsset>
-    <ImageAsset Include="Media.xcassets\stars_stack.imageset\stars-stack.png">
+    <ImageAsset Include="Media.xcassets\stars_stack.imageset\Contents.json">
       <Visible>false</Visible>
     </ImageAsset>
-    <ImageAsset Include="Media.xcassets\spell_book.imageset\spell-book.png">
+    <ImageAsset Include="Media.xcassets\trash_can.imageset\Contents.json">
       <Visible>false</Visible>
     </ImageAsset>
-    <ImageAsset Include="Media.xcassets\wooden_sign.imageset\wooden-sign.png">
+    <ImageAsset Include="Media.xcassets\wooden_sign.imageset\Contents.json">
       <Visible>false</Visible>
     </ImageAsset>
-    <ImageAsset Include="Media.xcassets\crystal_ball.imageset\crystal-ball-ios.png">
+	
+    <ImageAsset Include="Media.xcassets\crystal_ball.imageset\crystal_ball.png">
       <Visible>false</Visible>
     </ImageAsset>
+    <ImageAsset Include="Media.xcassets\funnel.imageset\funnel.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\plain_arrow_down.imageset\plain_arrow_down.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\plain_arrow_up.imageset\plain_arrow_up.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\round_star.imageset\round_star.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\settings_knobs.imageset\settings_knobs.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\spell_book.imageset\spell_book.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\stars_stack.imageset\stars_stack.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\trash_can.imageset\trash_can.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Media.xcassets\wooden_sign.imageset\wooden_sign.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+	
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Media.xcassets\crystal_ball.imageset\" />
     <Folder Include="Media.xcassets\icon.imageset\" />
+    <Folder Include="Media.xcassets\crystal_ball.imageset\" />
+    <Folder Include="Media.xcassets\funnel.imageset\" />
+    <Folder Include="Media.xcassets\plain_arrow_down.imageset\" />
+    <Folder Include="Media.xcassets\plain_arrow_up.imageset\" />
+    <Folder Include="Media.xcassets\round_star.imageset\" />
+    <Folder Include="Media.xcassets\settings_knobs.imageset\" />
     <Folder Include="Media.xcassets\spell_book.imageset\" />
     <Folder Include="Media.xcassets\stars_stack.imageset\" />
+    <Folder Include="Media.xcassets\trash_can.imageset\" />
     <Folder Include="Media.xcassets\wooden_sign.imageset\" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

AideDeJeu/AideDeJeu.iOS/Media.xcassets/crystal_ball.imageset/Contents.json

@@ -12,7 +12,7 @@
       "idiom": "universal"
     },
     {
-      "filename": "crystal-ball-ios.png",
+      "filename": "crystal_ball.png",
       "scale": "3x",
       "idiom": "universal"
     },

AideDeJeu/AideDeJeu.iOS/Media.xcassets/funnel.imageset/Contents.json

@@ -0,0 +1,94 @@
+{
+  "images": [
+    {
+      "idiom": "universal"
+    },
+    {
+      "scale": "1x",
+      "idiom": "universal"
+    },
+    {
+      "scale": "2x",
+      "idiom": "universal"
+    },
+    {
+      "filename": "funnel.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"
+    },
+    {
+      "idiom": "car"
+    },
+    {
+      "scale": "2x",
+      "idiom": "car"
+    },
+    {
+      "scale": "3x",
+      "idiom": "car"
+    }
+  ],
+  "info": {
+    "version": 1,
+    "author": "xcode"
+  }
+}

AideDeJeu/AideDeJeu.iOS/Media.xcassets/plain_arrow_down.imageset/Contents.json

@@ -0,0 +1,94 @@
+{
+  "images": [
+    {
+      "idiom": "universal"
+    },
+    {
+      "scale": "1x",
+      "idiom": "universal"
+    },
+    {
+      "scale": "2x",
+      "idiom": "universal"
+    },
+    {
+      "filename": "plain_arrow_down.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"
+    },
+    {
+      "idiom": "car"
+    },
+    {
+      "scale": "2x",
+      "idiom": "car"
+    },
+    {
+      "scale": "3x",
+      "idiom": "car"
+    }
+  ],
+  "info": {
+    "version": 1,
+    "author": "xcode"
+  }
+}

AideDeJeu/AideDeJeu.iOS/Media.xcassets/plain_arrow_up.imageset/Contents.json

@@ -0,0 +1,94 @@
+{
+  "images": [
+    {
+      "idiom": "universal"
+    },
+    {
+      "scale": "1x",
+      "idiom": "universal"
+    },
+    {
+      "scale": "2x",
+      "idiom": "universal"
+    },
+    {
+      "filename": "plain_arrow_up.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"
+    },
+    {
+      "idiom": "car"
+    },
+    {
+      "scale": "2x",
+      "idiom": "car"
+    },
+    {
+      "scale": "3x",
+      "idiom": "car"
+    }
+  ],
+  "info": {
+    "version": 1,
+    "author": "xcode"
+  }
+}

AideDeJeu/AideDeJeu.iOS/Media.xcassets/round_star.imageset/Contents.json

@@ -0,0 +1,94 @@
+{
+  "images": [
+    {
+      "idiom": "universal"
+    },
+    {
+      "scale": "1x",
+      "idiom": "universal"
+    },
+    {
+      "scale": "2x",
+      "idiom": "universal"
+    },
+    {
+      "filename": "round_star.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"
+    },
+    {
+      "idiom": "car"
+    },
+    {
+      "scale": "2x",
+      "idiom": "car"
+    },
+    {
+      "scale": "3x",
+      "idiom": "car"
+    }
+  ],
+  "info": {
+    "version": 1,
+    "author": "xcode"
+  }
+}

AideDeJeu/AideDeJeu.iOS/Media.xcassets/settings_knobs.imageset/Contents.json

@@ -0,0 +1,94 @@
+{
+  "images": [
+    {
+      "idiom": "universal"
+    },
+    {
+      "scale": "1x",
+      "idiom": "universal"
+    },
+    {
+      "scale": "2x",
+      "idiom": "universal"
+    },
+    {
+      "filename": "settings_knobs.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"
+    },
+    {
+      "idiom": "car"
+    },
+    {
+      "scale": "2x",
+      "idiom": "car"
+    },
+    {
+      "scale": "3x",
+      "idiom": "car"
+    }
+  ],
+  "info": {
+    "version": 1,
+    "author": "xcode"
+  }
+}

AideDeJeu/AideDeJeu.iOS/Media.xcassets/spell_book.imageset/Contents.json

@@ -12,7 +12,7 @@
       "idiom": "universal"
     },
     {
-      "filename": "spell-book.png",
+      "filename": "spell_book.png",
       "scale": "3x",
       "idiom": "universal"
     },

AideDeJeu/AideDeJeu.iOS/Media.xcassets/stars_stack.imageset/Contents.json

@@ -12,7 +12,7 @@
       "idiom": "universal"
     },
     {
-      "filename": "stars-stack.png",
+      "filename": "stars_stack.png",
       "scale": "3x",
       "idiom": "universal"
     },

AideDeJeu/AideDeJeu.iOS/Media.xcassets/trash_can.imageset/Contents.json

@@ -0,0 +1,94 @@
+{
+  "images": [
+    {
+      "idiom": "universal"
+    },
+    {
+      "scale": "1x",
+      "idiom": "universal"
+    },
+    {
+      "scale": "2x",
+      "idiom": "universal"
+    },
+    {
+      "filename": "trash_can.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"
+    },
+    {
+      "idiom": "car"
+    },
+    {
+      "scale": "2x",
+      "idiom": "car"
+    },
+    {
+      "scale": "3x",
+      "idiom": "car"
+    }
+  ],
+  "info": {
+    "version": 1,
+    "author": "xcode"
+  }
+}

AideDeJeu/AideDeJeu.iOS/Media.xcassets/wooden_sign.imageset/Contents.json

@@ -12,7 +12,7 @@
       "idiom": "universal"
     },
     {
-      "filename": "wooden-sign.png",
+      "filename": "wooden_sign.png",
       "scale": "3x",
       "idiom": "universal"
     },

Data/Icons/convert.bat

@@ -1,29 +1,29 @@
 
-goto nouveau
+rem goto nouveau
 
-call convertone.bat crystal_ball.png crystal-ball.svg
+call convertone.bat crystal_ball crystal-ball
 
-call convertone.bat funnel.png funnel.svg
+call convertone.bat funnel funnel
 
-call convertone.bat round_star.png round-star.svg
+call convertone.bat round_star round-star
 
-call convertone.bat settings_knobs.png settings-knobs.svg
+call convertone.bat settings_knobs settings-knobs
 
-call convertone.bat spell_book.png spell-book.svg
+call convertone.bat spell_book spell-book
 
-call convertone.bat stars_stack.png stars-stack.svg
+call convertone.bat stars_stack stars-stack
 
-call convertone.bat wooden_sign.png wooden-sign.svg
+call convertone.bat wooden_sign wooden-sign
 
-call convertone.bat plain_arrow_down.png plain-arrow-down.svg
+call convertone.bat plain_arrow_down plain-arrow-down
 
-call convertone.bat plain_arrow_up.png plain-arrow-up.svg
+call convertone.bat plain_arrow_up plain-arrow-up
 
-call convertone.bat trash_can.png trash-can.svg
+call convertone.bat trash_can trash-can
 
-call convertone.bat battle_axe.png battle-axe.svg
+rem call convertone.bat battle_axe battle-axe
 
 :nouveau
-call convertmain.bat battle_axe.png battle-axe.svg
+rem call convertmain.bat battle_axe.png battle-axe.svg
 
 pause

Data/Icons/convertone.bat

@@ -1,10 +1,22 @@
 set INKSCAPE=..\..\Ignore\inkscape\inkscape.com
 set ANDROID_PATH=..\..\AideDeJeu\AideDeJeu.Android\Resources\
 set UWP_PATH=..\..\AideDeJeu\AideDeJeu.UWP\
+set IOS_PATH=..\..\AideDeJeu\AideDeJeu.iOS\Media.xcassets\
 
-%INKSCAPE% -z -e %ANDROID_PATH%drawable\%1 -w 72 -h 72 %2
+goto ios
-%INKSCAPE% -z -e %ANDROID_PATH%drawable-hdpi\%1 -w 72 -h 72 %2
-%INKSCAPE% -z -e %ANDROID_PATH%drawable-xhdpi\%1 -w 96 -h 96 %2
-%INKSCAPE% -z -e %ANDROID_PATH%drawable-xxhdpi\%1 -w 144 -h 144 %2
-%INKSCAPE% -z -e %UWP_PATH%%1 -w 144 -h 144 %2
 
+:android
+
+%INKSCAPE% -z -e %ANDROID_PATH%drawable\%1.png -w 72 -h 72 %2.svg
+%INKSCAPE% -z -e %ANDROID_PATH%drawable-hdpi\%1.png -w 72 -h 72 %2.svg
+%INKSCAPE% -z -e %ANDROID_PATH%drawable-xhdpi\%1.png -w 96 -h 96 %2.svg
+%INKSCAPE% -z -e %ANDROID_PATH%drawable-xxhdpi\%1.png -w 144 -h 144 %2.svg
+
+:uwp
+
+%INKSCAPE% -z -e %UWP_PATH%%1.png -w 144 -h 144 %2.svg
+
+:ios
+
+md %IOS_PATH%%1.imageset\
+%INKSCAPE% -z -e %IOS_PATH%%1.imageset\%1.png -w 69 -h 69 %2.svg