From eb0cf984d9c8da6f1f8581ac3765942ff0239c04 Mon Sep 17 00:00:00 2001 From: Jerome Lacoste Date: Wed, 17 Jul 2024 09:27:33 +0200 Subject: [PATCH 1/4] Remove icons not present in xcode 15.x --- lib/ios.dart | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/ios.dart b/lib/ios.dart index 5fad0e7da2..494db302d6 100644 --- a/lib/ios.dart +++ b/lib/ios.dart @@ -23,23 +23,15 @@ class IosIconTemplate { /// details of the ios icons which need to be generated List iosIcons = [ - IosIconTemplate(name: '-20x20@1x', size: 20), IosIconTemplate(name: '-20x20@2x', size: 40), IosIconTemplate(name: '-20x20@3x', size: 60), - IosIconTemplate(name: '-29x29@1x', size: 29), IosIconTemplate(name: '-29x29@2x', size: 58), IosIconTemplate(name: '-29x29@3x', size: 87), - IosIconTemplate(name: '-40x40@1x', size: 40), IosIconTemplate(name: '-40x40@2x', size: 80), IosIconTemplate(name: '-40x40@3x', size: 120), - IosIconTemplate(name: '-50x50@1x', size: 50), - IosIconTemplate(name: '-50x50@2x', size: 100), - IosIconTemplate(name: '-57x57@1x', size: 57), IosIconTemplate(name: '-57x57@2x', size: 114), IosIconTemplate(name: '-60x60@2x', size: 120), IosIconTemplate(name: '-60x60@3x', size: 180), - IosIconTemplate(name: '-72x72@1x', size: 72), - IosIconTemplate(name: '-72x72@2x', size: 144), IosIconTemplate(name: '-76x76@1x', size: 76), IosIconTemplate(name: '-76x76@2x', size: 152), IosIconTemplate(name: '-83.5x83.5@2x', size: 167), From 10fbc732d52df9442cca87bb758740561b5bdf5b Mon Sep 17 00:00:00 2001 From: Jerome Lacoste Date: Wed, 17 Jul 2024 09:28:58 +0200 Subject: [PATCH 2/4] Add icons missing in xcode 15.x --- lib/ios.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/ios.dart b/lib/ios.dart index 494db302d6..d6783128ce 100644 --- a/lib/ios.dart +++ b/lib/ios.dart @@ -32,6 +32,9 @@ List iosIcons = [ IosIconTemplate(name: '-57x57@2x', size: 114), IosIconTemplate(name: '-60x60@2x', size: 120), IosIconTemplate(name: '-60x60@3x', size: 180), + IosIconTemplate(name: '-64x64@2x', size: 128), + IosIconTemplate(name: '-64x64@3x', size: 192), + IosIconTemplate(name: '-68x68@2x', size: 136), IosIconTemplate(name: '-76x76@1x', size: 76), IosIconTemplate(name: '-76x76@2x', size: 152), IosIconTemplate(name: '-83.5x83.5@2x', size: 167), From 4f57a6f4340e29a1aecb5323c8c0240a2d8d0c4b Mon Sep 17 00:00:00 2001 From: Jerome Lacoste Date: Wed, 17 Jul 2024 09:47:09 +0200 Subject: [PATCH 3/4] More fixes --- lib/ios.dart | 72 ++++++++++++++++++++-------------------------------- 1 file changed, 27 insertions(+), 45 deletions(-) diff --git a/lib/ios.dart b/lib/ios.dart index d6783128ce..bb085c1326 100644 --- a/lib/ios.dart +++ b/lib/ios.dart @@ -27,6 +27,8 @@ List iosIcons = [ IosIconTemplate(name: '-20x20@3x', size: 60), IosIconTemplate(name: '-29x29@2x', size: 58), IosIconTemplate(name: '-29x29@3x', size: 87), + IosIconTemplate(name: '-38x38@2x', size: 76), + IosIconTemplate(name: '-38x38@3x', size: 114), IosIconTemplate(name: '-40x40@2x', size: 80), IosIconTemplate(name: '-40x40@3x', size: 120), IosIconTemplate(name: '-57x57@2x', size: 114), @@ -35,7 +37,6 @@ List iosIcons = [ IosIconTemplate(name: '-64x64@2x', size: 128), IosIconTemplate(name: '-64x64@3x', size: 192), IosIconTemplate(name: '-68x68@2x', size: 136), - IosIconTemplate(name: '-76x76@1x', size: 76), IosIconTemplate(name: '-76x76@2x', size: 152), IosIconTemplate(name: '-83.5x83.5@2x', size: 167), IosIconTemplate(name: '-1024x1024@1x', size: 1024), @@ -248,12 +249,6 @@ List> createImageList(String fileNamePrefix) { filename: '$fileNamePrefix-20x20@3x.png', scale: '3x', ).toJson(), - ContentsImageObject( - size: '29x29', - idiom: 'iphone', - filename: '$fileNamePrefix-29x29@1x.png', - scale: '1x', - ).toJson(), ContentsImageObject( size: '29x29', idiom: 'iphone', @@ -267,34 +262,27 @@ List> createImageList(String fileNamePrefix) { scale: '3x', ).toJson(), ContentsImageObject( - size: '40x40', + size: '38x38', idiom: 'iphone', - filename: '$fileNamePrefix-40x40@2x.png', + filename: '$fileNamePrefix-38x38@2x.png', scale: '2x', ).toJson(), ContentsImageObject( - size: '40x40', + size: '38x38', idiom: 'iphone', - filename: '$fileNamePrefix-40x40@3x.png', + filename: '$fileNamePrefix-38x38@3x.png', scale: '3x', - ).toJson(), - ContentsImageObject( - size: '50x50', - idiom: 'ipad', - filename: '$fileNamePrefix-50x50@1x.png', - scale: '1x', - ).toJson(), - ContentsImageObject( - size: '50x50', - idiom: 'ipad', - filename: '$fileNamePrefix-50x50@2x.png', + ).toJson(), ContentsImageObject( + size: '40x40', + idiom: 'iphone', + filename: '$fileNamePrefix-40x40@2x.png', scale: '2x', ).toJson(), ContentsImageObject( - size: '57x57', + size: '40x40', idiom: 'iphone', - filename: '$fileNamePrefix-57x57@1x.png', - scale: '1x', + filename: '$fileNamePrefix-40x40@3x.png', + scale: '3x', ).toJson(), ContentsImageObject( size: '57x57', @@ -321,45 +309,39 @@ List> createImageList(String fileNamePrefix) { scale: '1x', ).toJson(), ContentsImageObject( - size: '20x20', + size: '57x57', idiom: 'ipad', - filename: '$fileNamePrefix-20x20@2x.png', + filename: '$fileNamePrefix-57x57@2x.png', scale: '2x', ).toJson(), ContentsImageObject( - size: '29x29', - idiom: 'ipad', - filename: '$fileNamePrefix-29x29@1x.png', - scale: '1x', - ).toJson(), - ContentsImageObject( - size: '29x29', + size: '60x60', idiom: 'ipad', - filename: '$fileNamePrefix-29x29@2x.png', + filename: '$fileNamePrefix-60x60@2x.png', scale: '2x', ).toJson(), ContentsImageObject( - size: '40x40', + size: '60x60', idiom: 'ipad', - filename: '$fileNamePrefix-40x40@1x.png', - scale: '1x', + filename: '$fileNamePrefix-60x60@3x.png', + scale: '3x', ).toJson(), ContentsImageObject( - size: '40x40', + size: '64x64', idiom: 'ipad', - filename: '$fileNamePrefix-40x40@2x.png', + filename: '$fileNamePrefix-64x64@2x.png', scale: '2x', ).toJson(), ContentsImageObject( - size: '72x72', + size: '64x64', idiom: 'ipad', - filename: '$fileNamePrefix-72x72@1x.png', - scale: '1x', + filename: '$fileNamePrefix-64x64@3x.png', + scale: '3x', ).toJson(), ContentsImageObject( - size: '72x72', + size: '68x68', idiom: 'ipad', - filename: '$fileNamePrefix-72x72@2x.png', + filename: '$fileNamePrefix-68x68@2x.png', scale: '2x', ).toJson(), ContentsImageObject( From a75cbc129a7321fb7ab326a13b48ee2c7f1e6c3a Mon Sep 17 00:00:00 2001 From: Jerome Lacoste Date: Wed, 17 Jul 2024 09:50:09 +0200 Subject: [PATCH 4/4] Adjust to latest contents.json format --- lib/ios.dart | 76 +++++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/lib/ios.dart b/lib/ios.dart index bb085c1326..d911fa8e8a 100644 --- a/lib/ios.dart +++ b/lib/ios.dart @@ -31,7 +31,6 @@ List iosIcons = [ IosIconTemplate(name: '-38x38@3x', size: 114), IosIconTemplate(name: '-40x40@2x', size: 80), IosIconTemplate(name: '-40x40@3x', size: 120), - IosIconTemplate(name: '-57x57@2x', size: 114), IosIconTemplate(name: '-60x60@2x', size: 120), IosIconTemplate(name: '-60x60@3x', size: 180), IosIconTemplate(name: '-64x64@2x', size: 128), @@ -202,12 +201,14 @@ class ContentsImageObject { ContentsImageObject({ required this.size, required this.idiom, + required this.platform, required this.filename, required this.scale, }); final String size; final String idiom; + final String platform; final String filename; final String scale; @@ -215,6 +216,7 @@ class ContentsImageObject { return { 'size': size, 'idiom': idiom, + 'platform': platform, 'filename': filename, 'scale': scale, }; @@ -239,132 +241,140 @@ List> createImageList(String fileNamePrefix) { final List> imageList = >[ ContentsImageObject( size: '20x20', - idiom: 'iphone', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-20x20@2x.png', scale: '2x', ).toJson(), ContentsImageObject( size: '20x20', - idiom: 'iphone', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-20x20@3x.png', scale: '3x', ).toJson(), ContentsImageObject( size: '29x29', - idiom: 'iphone', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-29x29@2x.png', scale: '2x', ).toJson(), ContentsImageObject( size: '29x29', - idiom: 'iphone', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-29x29@3x.png', scale: '3x', ).toJson(), ContentsImageObject( size: '38x38', - idiom: 'iphone', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-38x38@2x.png', scale: '2x', ).toJson(), ContentsImageObject( size: '38x38', - idiom: 'iphone', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-38x38@3x.png', scale: '3x', ).toJson(), ContentsImageObject( size: '40x40', - idiom: 'iphone', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-40x40@2x.png', scale: '2x', ).toJson(), ContentsImageObject( size: '40x40', - idiom: 'iphone', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-40x40@3x.png', scale: '3x', ).toJson(), - ContentsImageObject( - size: '57x57', - idiom: 'iphone', - filename: '$fileNamePrefix-57x57@2x.png', - scale: '2x', - ).toJson(), ContentsImageObject( size: '60x60', - idiom: 'iphone', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-60x60@2x.png', scale: '2x', ).toJson(), ContentsImageObject( size: '60x60', - idiom: 'iphone', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-60x60@3x.png', scale: '3x', ).toJson(), ContentsImageObject( size: '20x20', - idiom: 'ipad', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-20x20@1x.png', scale: '1x', ).toJson(), - ContentsImageObject( - size: '57x57', - idiom: 'ipad', - filename: '$fileNamePrefix-57x57@2x.png', - scale: '2x', - ).toJson(), ContentsImageObject( size: '60x60', - idiom: 'ipad', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-60x60@2x.png', scale: '2x', ).toJson(), ContentsImageObject( size: '60x60', - idiom: 'ipad', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-60x60@3x.png', scale: '3x', ).toJson(), ContentsImageObject( size: '64x64', - idiom: 'ipad', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-64x64@2x.png', scale: '2x', ).toJson(), ContentsImageObject( size: '64x64', - idiom: 'ipad', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-64x64@3x.png', scale: '3x', ).toJson(), ContentsImageObject( size: '68x68', - idiom: 'ipad', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-68x68@2x.png', scale: '2x', ).toJson(), ContentsImageObject( size: '76x76', - idiom: 'ipad', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-76x76@1x.png', scale: '1x', ).toJson(), ContentsImageObject( size: '76x76', - idiom: 'ipad', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-76x76@2x.png', scale: '2x', ).toJson(), ContentsImageObject( size: '83.5x83.5', - idiom: 'ipad', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-83.5x83.5@2x.png', scale: '2x', ).toJson(), ContentsImageObject( size: '1024x1024', - idiom: 'ios-marketing', + idiom: 'universal', + platform: 'ios', filename: '$fileNamePrefix-1024x1024@1x.png', scale: '1x', ).toJson(),