diff --git a/contrib/mobile/CMakeLists.txt b/contrib/mobile/CMakeLists.txt index 457a27b7c37765042bb4d55eaab3884aac65e9c1..494066f230c6eb901409c619e292fdb4c1e65828 100644 --- a/contrib/mobile/CMakeLists.txt +++ b/contrib/mobile/CMakeLists.txt @@ -127,7 +127,7 @@ if(ENABLE_BUILD_IOS_EMULATOR OR ENABLE_BUILD_IOS) add_custom_command(TARGET xcodeProject POST_BUILD COMMAND sed -e \"s|Onelab|BBEMG|\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG.xcodeproj/project.pbxproj") add_custom_command(TARGET xcodeProject POST_BUILD COMMAND - sed -e \"s|Images.xcassets|ImagesBBEMG.xcassets|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG.xcodeproj/project.pbxproj") + sed -e \"s|Images.xcassets|Images_BBEMG.xcassets|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG.xcodeproj/project.pbxproj") add_custom_command(TARGET xcodeProject POST_BUILD COMMAND sed -e \"s|ONELAB|BBEMG|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG/en.lproj/iPhoneiPodStoryboard.storyboard") add_custom_command(TARGET xcodeProject POST_BUILD COMMAND diff --git a/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/AppIcon.appiconset/Contents.json b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000000000000000000000000000000000..07ee4c759577f9a8be1177bb4f4b53c076aae70e --- /dev/null +++ b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,56 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "icon_app_iphone_retina.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "icon_app_ipad.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "icon_app_ipad_retina.png", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/AppIcon.appiconset/icon_app_ipad.png b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/AppIcon.appiconset/icon_app_ipad.png new file mode 100644 index 0000000000000000000000000000000000000000..eb2ca087184912ea4f7c62e92f543107297fc2c8 Binary files /dev/null and b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/AppIcon.appiconset/icon_app_ipad.png differ diff --git a/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/AppIcon.appiconset/icon_app_ipad_retina.png b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/AppIcon.appiconset/icon_app_ipad_retina.png new file mode 100644 index 0000000000000000000000000000000000000000..df87417b3ead571623ccb7c61c709d6c6670e2da Binary files /dev/null and b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/AppIcon.appiconset/icon_app_ipad_retina.png differ diff --git a/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/AppIcon.appiconset/icon_app_iphone_retina.png b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/AppIcon.appiconset/icon_app_iphone_retina.png new file mode 100644 index 0000000000000000000000000000000000000000..23672872fddf773abf320908b682c49c2560fc80 Binary files /dev/null and b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/AppIcon.appiconset/icon_app_iphone_retina.png differ diff --git a/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/Contents.json b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/Contents.json new file mode 100644 index 0000000000000000000000000000000000000000..ee3a5d7e31863f3b6e7828bf3642948f7688f734 --- /dev/null +++ b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/Contents.json @@ -0,0 +1,57 @@ +{ + "images" : [ + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "filename" : "splash640x960.png", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "retina4", + "filename" : "splash640x1136.png", + "minimum-system-version" : "7.0", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "filename" : "splash768x1024.png", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "filename" : "splash1024x768.png", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "filename" : "splash1536x2048.png", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "filename" : "splash2048x1536.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash1024x768.png b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash1024x768.png new file mode 100644 index 0000000000000000000000000000000000000000..9e5705aa0189e6fa1d307b415f17e5d76b496f32 Binary files /dev/null and b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash1024x768.png differ diff --git a/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash1536x2048.png b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash1536x2048.png new file mode 100644 index 0000000000000000000000000000000000000000..6719913e855ef3434c884fb85cf3d51959fc86f5 Binary files /dev/null and b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash1536x2048.png differ diff --git a/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash2048x1536.png b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash2048x1536.png new file mode 100644 index 0000000000000000000000000000000000000000..760c01e12194b3dfbfebd0241152b6b9f846a17c Binary files /dev/null and b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash2048x1536.png differ diff --git a/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash640x1136.png b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash640x1136.png new file mode 100644 index 0000000000000000000000000000000000000000..e30a2e6eb9e1db0c5b178af64860e29b47b61517 Binary files /dev/null and b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash640x1136.png differ diff --git a/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash640x960.png b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash640x960.png new file mode 100644 index 0000000000000000000000000000000000000000..d984dfa6e058054713ca408c6a849b20c3212b26 Binary files /dev/null and b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash640x960.png differ diff --git a/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash768x1024.png b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash768x1024.png new file mode 100644 index 0000000000000000000000000000000000000000..6d0acfb39343a8b5b90b42bed8d66411b16160ea Binary files /dev/null and b/contrib/mobile/iOS/Onelab/Images_BBEMG.xcassets/LaunchImage.launchimage/splash768x1024.png differ diff --git a/contrib/mobile/utils/make_icon_ios.sh b/contrib/mobile/utils/make_icon_ios.sh index 5a85cb76342a8f867a8fea193028b009563d13ad..d207d7300a3d2a5485333d354d2a920362d86154 100755 --- a/contrib/mobile/utils/make_icon_ios.sh +++ b/contrib/mobile/utils/make_icon_ios.sh @@ -1,12 +1,22 @@ #!/bin/sh -source=../../../utils/icons/gmsh_mobile_master.png -#source=../../../utils/icons/bbemg-twitter.png +icon_source=../../../utils/icons/gmsh_mobile_master.png +launch_source=../../../utils/icons/gmsh_mobile_master.png -mkdir -p ios.iconset -# App icons (iPad) -convert -scale 152 ${source} ios.iconset/icon_app_ipad_retina.png -convert -scale 76 ${source} ios.iconset/icon_app_ipad.png +icon_source=../../../utils/icons/bbemg-logo-twitter-300.png +launch_source=../../../utils/icons/bbemg-logo-color-rgb.png +mkdir -p AppIcon.appiconset +# App icons (iPad) +convert -scale 152 ${icon_source} AppIcon.appiconset/icon_app_ipad_retina.png +convert -scale 76 ${icon_source} AppIcon.appiconset/icon_app_ipad.png # App icon (iPhone) -convert -scale 120 ${source} ios.iconset/icon_app_iphone_retina.png +convert -scale 120 ${icon_source} AppIcon.appiconset/icon_app_iphone_retina.png + +mkdir -p LaunchImage.launchimage +convert ${launch_source} -gravity Center -crop 1024x768+0+0\! -background white -flatten LaunchImage.launchimage/splash1024x768.png +convert ${launch_source} -gravity Center -crop 1536x2048+0+0\! -background white -flatten LaunchImage.launchimage/splash1536x2048.png +convert ${launch_source} -gravity Center -crop 2048x1536+0+0\! -background white -flatten LaunchImage.launchimage/splash2048x1536.png +convert ${launch_source} -gravity Center -crop 640x1136+0+0\! -background white -flatten LaunchImage.launchimage/splash640x1136.png +convert ${launch_source} -gravity Center -crop 640x960+0+0\! -background white -flatten LaunchImage.launchimage/splash640x960.png +convert ${launch_source} -gravity Center -crop 768x1024+0+0\! -background white -flatten LaunchImage.launchimage/splash768x1024.png