From 6081b461d0aeff993fe7583fb2f0abffebd8051e Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Fri, 14 May 2021 16:39:41 -0400 Subject: [PATCH] Revert "[flutter_template_images] Add support for new template and shared platform files" (#353) Reverts #295 The corresponding flutter/flutter changes never landed, so that package layout is unusable for now. Since 2.0 was published already, to minimize long-term confusion this uses 3.0 rather than going back to 1.0. --- packages/flutter_template_images/CHANGELOG.md | 4 ++++ packages/flutter_template_images/pubspec.yaml | 2 +- .../web/icons/Icon-maskable-192.png.copy.tmpl | Bin .../web/icons/Icon-maskable-512.png.copy.tmpl | Bin .../windows.tmpl/runner/resources/app_icon.ico | Bin .../assets/images/2.0x/flutter_logo.png | Bin 619 -> 0 bytes .../assets/images/3.0x/flutter_logo.png | Bin 810 -> 0 bytes .../assets/images/flutter_logo.png | Bin 419 -> 0 bytes 8 files changed, 5 insertions(+), 1 deletion(-) rename packages/flutter_template_images/templates/{app_shared => app}/web/icons/Icon-maskable-192.png.copy.tmpl (100%) rename packages/flutter_template_images/templates/{app_shared => app}/web/icons/Icon-maskable-512.png.copy.tmpl (100%) rename packages/flutter_template_images/templates/{app_shared => app}/windows.tmpl/runner/resources/app_icon.ico (100%) delete mode 100644 packages/flutter_template_images/templates/list_detail_app/assets/images/2.0x/flutter_logo.png delete mode 100644 packages/flutter_template_images/templates/list_detail_app/assets/images/3.0x/flutter_logo.png delete mode 100644 packages/flutter_template_images/templates/list_detail_app/assets/images/flutter_logo.png diff --git a/packages/flutter_template_images/CHANGELOG.md b/packages/flutter_template_images/CHANGELOG.md index 7442d0ba82..e287035632 100644 --- a/packages/flutter_template_images/CHANGELOG.md +++ b/packages/flutter_template_images/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.0.0 + +* Reverts to the 1.0 layout, since the new app template never landed. + ## 2.0.0 * Move assets common to all app templates to a new `app_shared` directory. diff --git a/packages/flutter_template_images/pubspec.yaml b/packages/flutter_template_images/pubspec.yaml index 8b51fb2d5c..bef60961ee 100644 --- a/packages/flutter_template_images/pubspec.yaml +++ b/packages/flutter_template_images/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_template_images description: Image files for use in flutter_tools templates. -version: 2.0.0 +version: 3.0.0 homepage: https://github.com/flutter/packages/tree/master/packages/flutter_template_images environment: diff --git a/packages/flutter_template_images/templates/app_shared/web/icons/Icon-maskable-192.png.copy.tmpl b/packages/flutter_template_images/templates/app/web/icons/Icon-maskable-192.png.copy.tmpl similarity index 100% rename from packages/flutter_template_images/templates/app_shared/web/icons/Icon-maskable-192.png.copy.tmpl rename to packages/flutter_template_images/templates/app/web/icons/Icon-maskable-192.png.copy.tmpl diff --git a/packages/flutter_template_images/templates/app_shared/web/icons/Icon-maskable-512.png.copy.tmpl b/packages/flutter_template_images/templates/app/web/icons/Icon-maskable-512.png.copy.tmpl similarity index 100% rename from packages/flutter_template_images/templates/app_shared/web/icons/Icon-maskable-512.png.copy.tmpl rename to packages/flutter_template_images/templates/app/web/icons/Icon-maskable-512.png.copy.tmpl diff --git a/packages/flutter_template_images/templates/app_shared/windows.tmpl/runner/resources/app_icon.ico b/packages/flutter_template_images/templates/app/windows.tmpl/runner/resources/app_icon.ico similarity index 100% rename from packages/flutter_template_images/templates/app_shared/windows.tmpl/runner/resources/app_icon.ico rename to packages/flutter_template_images/templates/app/windows.tmpl/runner/resources/app_icon.ico diff --git a/packages/flutter_template_images/templates/list_detail_app/assets/images/2.0x/flutter_logo.png b/packages/flutter_template_images/templates/list_detail_app/assets/images/2.0x/flutter_logo.png deleted file mode 100644 index b65164de707ffeaf0adfca5fca65532bf97e6903..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 619 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&H3s;ExB}^b{r?#vrgK>I2kif@ zvH816@%GSTKN!MhbHpsw+WI}@_)o2^Ujq(*4>|fhmwB2f9E#&lh@dHUo7LNZ{xgp@r+-ynauvLPwNoN4|Z_>tNAZ;@h5j(?S79JcUYfB`=#qy r6fZFpo3n_4Rl|XiE8s&sR~^H;NW15^d4qg`5ys%@>gTe~DWM4f{@o*g diff --git a/packages/flutter_template_images/templates/list_detail_app/assets/images/3.0x/flutter_logo.png b/packages/flutter_template_images/templates/list_detail_app/assets/images/3.0x/flutter_logo.png deleted file mode 100644 index 97e5dc9af6e1093966c5cd42d608fd6fbb6a0c59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 810 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX16#+gWu0UF2`*(-^-y@EH58eMI z^w{s z-$IW5@LT%57HGFUA^wwrfyu|y#WAGf*4wMk zgAN-AxF%k#KCURBVA1=%-ucp;9Uj}ZG#l?Wes0(B%({NdIoXW<{g3WiupaK0x3By2 zO4s)_FGS)mJr|)n_%@ z)kihD)q6Gi)z>tJ)#o(E)yFiZ)%!H&)t5Jx)rUK-{vXl2fA4~;^_xE>GN_~ps{eO!b9`tLyxW8Xh;HNSd-@|xOj=ytR+do>D zt9>mOkvaAL$-iq%!vCf*DgR4ol&oKHV8Z?Agj4S|4W8wT%=mnri|3a%tJ>eCOpE`; zHb(y6c3?w&Y{ISmIsp&Mrw9G7`Sv8_P1LLTesVhEI)8;vvu5vq*tGV3&cSo}TNXSq zj|})It+V3iSy7We$GB|jf?4DCFKlYK@8ftOf60QQ_A~Fi*3bCZZ_jpf?zg4|^)^x| zt2OmGe$>0=M;cybjjOklN_(oQ_u}uL;@3elyf)C=)PemO(7H=26jVtWmubrDh3}(04)hM&xSK7O%X|>Mc j1|}|z1*pUejUUWgK0Q%uH(H?zOn3~Qu6{1-oD!M<&k2w@ diff --git a/packages/flutter_template_images/templates/list_detail_app/assets/images/flutter_logo.png b/packages/flutter_template_images/templates/list_detail_app/assets/images/flutter_logo.png deleted file mode 100644 index b5c6ca710c937527ca8d2d344214243d6db33832..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!@&kNAT!FN~`u7^!zegPZ&Ja3_ z)pe?NNpCL!ThaUauw)u_bwr{%Izl9$A!5B7M$govP zxh~|$561A>Od+#a0;aQjP2sie<+JJ*(`u4bZve_F*PR4v(b@jZ=Md1SAK%^B{{yWQ zFA4GsW)M(NFaUyj5NMdc{{H>@?}1?b(XAk7pYe2Y42d}W_VP)gCIbQ2ix!U>4q9?~ zIsEybZ^G7cAu^%-PQ=yx*;eIK#gYnUFW+9QvQNJH+nbx4)6dKOIC(3+3g6;V=GFge(48{@_RM&lLju^uE+^au+>tK7OIONyesA;#Zub zQs3&YevL0~GuE6t~Fo%7BFztX3q{1RVU;;PiN_-8qleWA`_& zw({X*ef?P{^t~Y0vFF>PCUdo}=4?%^3QRb0$VpT0kLyEL`Hh?APM