From a52d4c57efb92ffbd0cd98e08f8ac6468be033b3 Mon Sep 17 00:00:00 2001 From: Jon Hanson Date: Wed, 6 Dec 2023 20:22:04 -0500 Subject: [PATCH] Roll back web fade as it was a breaking change. Fixes #628. Fixes #627. Fixes #622. --- CHANGELOG.md | 4 +++ README.md | 6 +--- example/pubspec.lock | 28 ++++++++--------- example/pubspec.yaml | 4 --- lib/cli_commands.dart | 4 --- lib/templates.dart | 70 ++++++++++++++++--------------------------- lib/web.dart | 20 ++++--------- pubspec.yaml | 2 +- 8 files changed, 51 insertions(+), 87 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f4eb4c..842bf54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [2.3.7] - (2023-Dec-06) + +- Roll back web fade as it was a breaking change. Fixes [#628](https://github.com/jonbhanson/flutter_native_splash/issues/628). Fixes [#627](https://github.com/jonbhanson/flutter_native_splash/issues/627). Fixes [#622](https://github.com/jonbhanson/flutter_native_splash/issues/622). + ## [2.3.6] - (2023-Nov-20) - Add fade between splash and app on web. Thanks [eggp](https://github.com/eggp) for the suggestion and example code. Closes [#608](https://github.com/jonbhanson/flutter_native_splash/issues/608). diff --git a/README.md b/README.md index 303840b..f711c4a 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ First, add `flutter_native_splash` as a dependency in your pubspec.yaml file. ```yaml dependencies: - flutter_native_splash: ^2.3.6 + flutter_native_splash: ^2.3.7 ``` Don't forget to `flutter pub get`. @@ -169,10 +169,6 @@ flutter_native_splash: # SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: [SystemUiOverlay.bottom, SystemUiOverlay.top], ); #fullscreen: true - # On web, the splash screen fades out in 250ms. This fade delay can be adjusted by changing - # the web_splash_fade_time_ms parameter. - #web_splash_fade_time_ms: 250 - # If you have changed the name(s) of your info.plist file(s), you can specify the filename(s) # with the info_plist_files parameter. Remove only the # characters in the three lines below, # do not remove any spaces: diff --git a/example/pubspec.lock b/example/pubspec.lock index a9d2bce..cbd7797 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -124,7 +124,7 @@ packages: path: ".." relative: true source: path - version: "2.3.6" + version: "2.3.7" flutter_test: dependency: "direct dev" description: flutter @@ -187,10 +187,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -232,18 +232,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -264,10 +264,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" typed_data: dependency: transitive description: @@ -296,10 +296,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" xml: dependency: transitive description: @@ -317,5 +317,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.5.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 3939426..60ee61d 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -230,10 +230,6 @@ flutter_native_splash: # SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: [SystemUiOverlay.bottom, SystemUiOverlay.top], ); #fullscreen: true - # On web, the splash screen fades out in 250ms. This fade delay can be adjusted by changing - # the web_splash_fade_time_ms parameter. - #web_splash_fade_time_ms: 250 - # If you have changed the name(s) of your info.plist file(s), you can specify the filename(s) # with the info_plist_files parameter. Remove only the # characters in the three lines below, # do not remove any spaces: diff --git a/lib/cli_commands.dart b/lib/cli_commands.dart index 183c166..da5c563 100644 --- a/lib/cli_commands.dart +++ b/lib/cli_commands.dart @@ -119,7 +119,6 @@ void createSplashByConfig(Map config) { final String iosContentMode = config[_Parameter.iosContentMode] as String? ?? 'center'; final webImageMode = config[_Parameter.webImageMode] as String? ?? 'center'; - final fadeTimeMs = config[_Parameter.fadeTimeMs] as int? ?? 250; String? android12Image; String? android12DarkImage; String? android12IconBackgroundColor; @@ -215,7 +214,6 @@ void createSplashByConfig(Map config) { darkColor: darkColorWeb ?? darkColor, imageMode: webImageMode, brandingMode: brandingGravity, - fadeTimeMs: fadeTimeMs, ); } else { print('Web folder not found, skipping web splash update...'); @@ -457,7 +455,6 @@ class _Parameter { static const plistFiles = 'info_plist_files'; static const web = 'web'; static const webImageMode = 'web_image_mode'; - static const fadeTimeMs = 'web_splash_fade_time_ms'; static List all = [ android, @@ -505,6 +502,5 @@ class _Parameter { plistFiles, web, webImageMode, - fadeTimeMs, ]; } diff --git a/lib/templates.dart b/lib/templates.dart index 3d12343..a19537d 100644 --- a/lib/templates.dart +++ b/lib/templates.dart @@ -407,34 +407,19 @@ const String _iOSBrandingRightBottomConstraints = ''' /// Web related templates const String _webCss = '''