diff --git a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj index df54a29d..f84642cf 100644 --- a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj +++ b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj @@ -219,36 +219,81 @@ false - - false - - - false - + false + + false + + + false + + + false + + + false + + + false + false - + false - + false - + false - + + false + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + - + + + + + + + diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/crystal_ball.imageset/Contents.json b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/crystal_ball.imageset/Contents.json index 9cc51ea3..7a1a41e5 100644 --- a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/crystal_ball.imageset/Contents.json +++ b/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" }, diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/crystal_ball.imageset/crystal-ball-ios.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/crystal_ball.imageset/crystal-ball-ios.png deleted file mode 100644 index 7ab9ce4b..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/crystal_ball.imageset/crystal-ball-ios.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/crystal_ball.imageset/crystal_ball.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/crystal_ball.imageset/crystal_ball.png new file mode 100644 index 00000000..2fb4acca Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/crystal_ball.imageset/crystal_ball.png differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/funnel.imageset/Contents.json b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/funnel.imageset/Contents.json new file mode 100644 index 00000000..47721757 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/funnel.imageset/funnel.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/funnel.imageset/funnel.png new file mode 100644 index 00000000..97b2247c Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/funnel.imageset/funnel.png differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/plain_arrow_down.imageset/Contents.json b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/plain_arrow_down.imageset/Contents.json new file mode 100644 index 00000000..e2c62c25 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/plain_arrow_down.imageset/plain_arrow_down.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/plain_arrow_down.imageset/plain_arrow_down.png new file mode 100644 index 00000000..386753af Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/plain_arrow_down.imageset/plain_arrow_down.png differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/plain_arrow_up.imageset/Contents.json b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/plain_arrow_up.imageset/Contents.json new file mode 100644 index 00000000..7c8ae028 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/plain_arrow_up.imageset/plain_arrow_up.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/plain_arrow_up.imageset/plain_arrow_up.png new file mode 100644 index 00000000..44ad3a7a Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/plain_arrow_up.imageset/plain_arrow_up.png differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/round_star.imageset/Contents.json b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/round_star.imageset/Contents.json new file mode 100644 index 00000000..cf2bd857 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/round_star.imageset/round_star.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/round_star.imageset/round_star.png new file mode 100644 index 00000000..ec3d21ea Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/round_star.imageset/round_star.png differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/settings_knobs.imageset/Contents.json b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/settings_knobs.imageset/Contents.json new file mode 100644 index 00000000..9950b9b2 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/settings_knobs.imageset/settings_knobs.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/settings_knobs.imageset/settings_knobs.png new file mode 100644 index 00000000..44cf7f8b Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/settings_knobs.imageset/settings_knobs.png differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/spell_book.imageset/Contents.json b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/spell_book.imageset/Contents.json index 8dbcfef2..4e4cf36c 100644 --- a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/spell_book.imageset/Contents.json +++ b/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" }, diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/spell_book.imageset/spell-book.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/spell_book.imageset/spell-book.png deleted file mode 100644 index 32911105..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/spell_book.imageset/spell-book.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/spell_book.imageset/spell_book.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/spell_book.imageset/spell_book.png new file mode 100644 index 00000000..8a043210 Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/spell_book.imageset/spell_book.png differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/stars_stack.imageset/Contents.json b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/stars_stack.imageset/Contents.json index a70e6a50..c32bc1d7 100644 --- a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/stars_stack.imageset/Contents.json +++ b/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" }, diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/stars_stack.imageset/stars-stack.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/stars_stack.imageset/stars-stack.png deleted file mode 100644 index ee07ab87..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/stars_stack.imageset/stars-stack.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/stars_stack.imageset/stars_stack.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/stars_stack.imageset/stars_stack.png new file mode 100644 index 00000000..7cc35569 Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/stars_stack.imageset/stars_stack.png differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/trash_can.imageset/Contents.json b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/trash_can.imageset/Contents.json new file mode 100644 index 00000000..6b3cd5f1 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/trash_can.imageset/trash_can.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/trash_can.imageset/trash_can.png new file mode 100644 index 00000000..184c09a7 Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/trash_can.imageset/trash_can.png differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/wooden_sign.imageset/Contents.json b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/wooden_sign.imageset/Contents.json index 5c087a05..6d674931 100644 --- a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/wooden_sign.imageset/Contents.json +++ b/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" }, diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/wooden_sign.imageset/wooden-sign.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/wooden_sign.imageset/wooden-sign.png deleted file mode 100644 index 549cd59c..00000000 Binary files a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/wooden_sign.imageset/wooden-sign.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.iOS/Media.xcassets/wooden_sign.imageset/wooden_sign.png b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/wooden_sign.imageset/wooden_sign.png new file mode 100644 index 00000000..c5398593 Binary files /dev/null and b/AideDeJeu/AideDeJeu.iOS/Media.xcassets/wooden_sign.imageset/wooden_sign.png differ diff --git a/Data/Icons/convert.bat b/Data/Icons/convert.bat index 7052ebb5..e5e77b17 100644 --- a/Data/Icons/convert.bat +++ b/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 diff --git a/Data/Icons/convertone.bat b/Data/Icons/convertone.bat index a15575a6..c6e18a2f 100644 --- a/Data/Icons/convertone.bat +++ b/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 -%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 +goto ios +: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