diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index a6fa2b9..193d0dc 100644 --- a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,224 +1,158 @@ { - "images" : [ - { - "filename" : "icon-20@2x-ipad.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" - }, - { - "filename" : "icon-20@3x.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" - }, - { - "filename" : "icon-29-ipad.png", - "idiom" : "iphone", - "scale" : "1x", - "size" : "29x29" - }, - { - "filename" : "icon-29@2x-ipad.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" - }, - { - "filename" : "icon-29@3x.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" - }, - { - "filename" : "icon-40@2x.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" - }, - { - "filename" : "icon-40@3x.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" - }, - { - "filename" : "icon-57.png", - "idiom" : "iphone", - "scale" : "1x", - "size" : "57x57" - }, - { - "filename" : "icon-57@2x.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "57x57" - }, - { - "filename" : "icon-60@2x.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" - }, - { - "filename" : "icon-60@3x.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { - "filename" : "icon-1024.png", - "idiom" : "ios-marketing", - "scale" : "1x", - "size" : "1024x1024" - }, - { - "filename" : "icon-20-ipad.png", - "idiom" : "universal", - "scale" : "1x", - "size" : "20x20" - }, - { - "filename" : "icon-38@2x.png", - "idiom" : "universal", - "scale" : "2x", - "size" : "38x38" - }, - { - "filename" : "icon-40.png", - "idiom" : "universal", - "scale" : "1x", - "size" : "40x40" - }, - { - "filename" : "icon-50.png", - "idiom" : "universal", - "scale" : "1x", - "size" : "50x50" - }, - { - "filename" : "icon-50@2x.png", - "idiom" : "universal", - "scale" : "2x", - "size" : "50x50" - }, - { - "filename" : "icon-64@2x.png", - "idiom" : "universal", - "scale" : "2x", - "size" : "64x64" - }, - { - "filename" : "icon-64@3x.png", - "idiom" : "universal", - "scale" : "3x", - "size" : "64x64" - }, - { - "filename" : "icon-68@2x.png", - "idiom" : "universal", - "scale" : "2x", - "size" : "68x68" - }, - { - "filename" : "icon-72.png", - "idiom" : "universal", - "scale" : "1x", - "size" : "72x72" - }, - { - "filename" : "icon-72@2x.png", - "idiom" : "universal", - "scale" : "2x", - "size" : "72x72" - }, - { - "filename" : "icon-76.png", - "idiom" : "universal", - "scale" : "1x", - "size" : "76x76" - }, - { - "filename" : "icon-76@2x.png", - "idiom" : "universal", - "scale" : "2x", - "size" : "76x76" - }, - { - "filename" : "icon-83.5@2x.png", - "idiom" : "universal", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { - "filename" : "icon-20@2x 1.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20", - "unassigned" : true - }, - { - "filename" : "icon-29.png", - "idiom" : "iphone", - "scale" : "1x", - "size" : "29x29", - "unassigned" : true - }, - { - "filename" : "icon-29@2x 1.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29", - "unassigned" : true + "images": [ + { + "size": "20x20", + "idiom": "iphone", + "filename": "icon-20@2x.png", + "scale": "2x" + }, + { + "size": "20x20", + "idiom": "iphone", + "filename": "icon-20@3x.png", + "scale": "3x" + }, + { + "size": "29x29", + "idiom": "iphone", + "filename": "icon-29.png", + "scale": "1x" + }, + { + "size": "29x29", + "idiom": "iphone", + "filename": "icon-29@2x.png", + "scale": "2x" + }, + { + "size": "29x29", + "idiom": "iphone", + "filename": "icon-29@3x.png", + "scale": "3x" + }, + { + "size": "40x40", + "idiom": "iphone", + "filename": "icon-40@2x.png", + "scale": "2x" + }, + { + "size": "40x40", + "idiom": "iphone", + "filename": "icon-40@3x.png", + "scale": "3x" + }, + { + "size": "57x57", + "idiom": "iphone", + "filename": "icon-57.png", + "scale": "1x" + }, + { + "size": "57x57", + "idiom": "iphone", + "filename": "icon-57@2x.png", + "scale": "2x" + }, + { + "size": "60x60", + "idiom": "iphone", + "filename": "icon-60@2x.png", + "scale": "2x" + }, + { + "size": "60x60", + "idiom": "iphone", + "filename": "icon-60@3x.png", + "scale": "3x" + }, + { + "size": "20x20", + "idiom": "ipad", + "filename": "icon-20-ipad.png", + "scale": "1x" + }, + { + "size": "20x20", + "idiom": "ipad", + "filename": "icon-20@2x-ipad.png", + "scale": "2x" + }, + { + "size": "29x29", + "idiom": "ipad", + "filename": "icon-29-ipad.png", + "scale": "1x" + }, + { + "size": "29x29", + "idiom": "ipad", + "filename": "icon-29@2x-ipad.png", + "scale": "2x" + }, + { + "size": "40x40", + "idiom": "ipad", + "filename": "icon-40.png", + "scale": "1x" + }, + { + "size": "40x40", + "idiom": "ipad", + "filename": "icon-40@2x.png", + "scale": "2x" + }, + { + "size": "50x50", + "idiom": "ipad", + "filename": "icon-50.png", + "scale": "1x" + }, + { + "size": "50x50", + "idiom": "ipad", + "filename": "icon-50@2x.png", + "scale": "2x" + }, + { + "size": "72x72", + "idiom": "ipad", + "filename": "icon-72.png", + "scale": "1x" + }, + { + "size": "72x72", + "idiom": "ipad", + "filename": "icon-72@2x.png", + "scale": "2x" + }, + { + "size": "76x76", + "idiom": "ipad", + "filename": "icon-76.png", + "scale": "1x" + }, + { + "size": "76x76", + "idiom": "ipad", + "filename": "icon-76@2x.png", + "scale": "2x" + }, + { + "size": "83.5x83.5", + "idiom": "ipad", + "filename": "icon-83.5@2x.png", + "scale": "2x" + }, + { + "size": "1024x1024", + "idiom": "ios-marketing", + "filename": "icon-1024.png", + "scale": "1x" + } + ], + "info": { + "version": 1, + "author": "icon.wuruihong.com" } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} +} \ No newline at end of file diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x 1.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png similarity index 100% rename from making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x 1.png rename to making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x 1.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png similarity index 100% rename from making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x 1.png rename to making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-38@2x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-38@2x.png deleted file mode 100644 index 096aa85..0000000 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-38@2x.png and /dev/null differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-64@2x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-64@2x.png deleted file mode 100644 index b0e7871..0000000 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-64@2x.png and /dev/null differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-64@3x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-64@3x.png deleted file mode 100644 index 4d2df11..0000000 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-64@3x.png and /dev/null differ diff --git a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-68@2x.png b/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-68@2x.png deleted file mode 100644 index 649835d..0000000 Binary files a/making_school_asignment_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-68@2x.png and /dev/null differ diff --git a/making_school_asignment_app/ios/Runner/Base.lproj/LaunchScreen.storyboard b/making_school_asignment_app/ios/Runner/Base.lproj/LaunchScreen.storyboard index 280d86f..b9e7b32 100644 --- a/making_school_asignment_app/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ b/making_school_asignment_app/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -1,8 +1,10 @@ - - + + + - + + @@ -14,10 +16,15 @@ + - - + + + + + + @@ -34,11 +41,11 @@ - + - +