diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 98d5c0a..23eba57 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,28 +7,29 @@ assignees: '' --- +Attention: If you open a bug report without sufficient details, it will be closed. Is your question +related to Android 12? Please check the notes on Android 12 first (https://pub.dev/packages/flutter_native_splash#android-12-support). + **Describe the bug** -A clear and concise description of what the bug is. -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error +A clear and concise description of what the bug is. -**Expected behavior** -A clear and concise description of what you expected to happen. +**Configuration** -**Screenshots** -If applicable, add screenshots to help explain your problem. +Paste the flutter_native_splash section of your yaml config. **Device (please complete the following information):** - Device: [e.g. iPhone6] - OS: [e.g. iOS8.1] -**Flutter doctor** -Please paste the results of the `flutter doctor -v` here +**To Reproduce** +Steps to reproduce the behavior, using the example app: +1. Set the config on the example app to '...' +2. Run in an emulator configured with '...' +3. See error + +**Screenshots** +If applicable, add screenshots to help explain your problem. If in doubt, attach a screenshot. **Additional context** Add any other context about the problem here. diff --git a/.metadata b/.metadata index 0b5ddf0..308cb26 100644 --- a/.metadata +++ b/.metadata @@ -1,7 +1,7 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled and should not be manually edited. +# This file should be version controlled. version: revision: db747aa1331bd95bc9b3874c842261ca2d302cd5 diff --git a/CHANGELOG.md b/CHANGELOG.md index 5870f29..f3d1de4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [2.2.10] - (2022-Sep-25) + +- Update bug report template. +- Package housekeeping to stay up to date with Flutter. + ## [2.2.9] - (2022-Sep-07) - Update pub.dev links. Thanks [Joachim](https://github.com/nohli) for [PR #415](https://github.com/jonbhanson/flutter_native_splash/pull/415). diff --git a/README.md b/README.md index 78f65ad..a5287e0 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ First, add `flutter_native_splash` as a dependency in your pubspec.yaml file. ```yaml dependencies: - flutter_native_splash: ^2.2.9 + flutter_native_splash: ^2.2.10 ``` Don't forget to `flutter pub get`. diff --git a/analysis_options.yaml b/analysis_options.yaml index 5f9d5e6..c2e9092 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,4 +1,4 @@ -include: package:lint/analysis_options.yaml +include: package:flutter_lints/flutter.yaml linter: rules: diff --git a/android/.gitignore b/android/.gitignore index c6cbe56..161bdcd 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -6,3 +6,4 @@ .DS_Store /build /captures +.cxx diff --git a/android/build.gradle b/android/build.gradle index 9bdc8ca..23679be 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.1.2' } } diff --git a/example/.gitignore b/example/.gitignore index a8e938c..24476c5 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -32,9 +32,6 @@ migrate_working_dir/ .pub/ /build/ -# Web related -lib/generated_plugin_registrant.dart - # Symbolication related app.*.symbols diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 8d4492f..9625e10 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 2d1c026..212b594 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -283,7 +283,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -358,7 +358,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -407,7 +407,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist index 89cdd79..912cc83 100644 --- a/example/ios/Runner/Info.plist +++ b/example/ios/Runner/Info.plist @@ -45,5 +45,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/example/lib/main.dart b/example/lib/main.dart index d56c2aa..3c054a8 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -8,7 +8,7 @@ void main() { } class MyApp extends StatelessWidget { - const MyApp({Key? key}) : super(key: key); + const MyApp({super.key}); // This widget is the root of your application. @override @@ -33,7 +33,7 @@ class MyApp extends StatelessWidget { } class MyHomePage extends StatefulWidget { - const MyHomePage({Key? key, required this.title}) : super(key: key); + const MyHomePage({super.key, required this.title}); // This widget is the home page of your application. It is stateful, meaning // that it has a State object (defined below) that contains fields that affect diff --git a/example/pubspec.lock b/example/pubspec.lock index d6eb0e0..6b33177 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -21,7 +21,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -35,21 +35,14 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.2.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: @@ -77,14 +70,14 @@ packages: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.0.5" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -96,14 +89,14 @@ packages: name: flutter_lints url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "2.0.1" flutter_native_splash: dependency: "direct main" description: path: ".." relative: true source: path - version: "2.2.5" + version: "2.2.10" flutter_test: dependency: "direct dev" description: flutter @@ -135,48 +128,41 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.6.4" - lint: - dependency: transitive - description: - name: lint - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.2" lints: dependency: transitive description: name: lints url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "2.0.0" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" petitparser: dependency: transitive description: @@ -195,7 +181,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -216,21 +202,21 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.12" typed_data: dependency: transitive description: @@ -267,5 +253,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=2.17.0 <3.0.0" - flutter: ">=1.17.0" + dart: ">=2.18.1 <3.0.0" + flutter: ">=2.5.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index c662afc..c79346d 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -12,13 +12,15 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # build by specifying --build-name and --build-number, respectively. # In Android, build-name is used as versionName while build-number used as versionCode. # Read more about Android versioning at https://developer.android.com/studio/publish/versioning -# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. +# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +# In Windows, build-name is used as the major, minor, and patch parts +# of the product and file versions while build-number is used as the build suffix. version: 1.0.0+1 environment: - sdk: ">=2.17.0 <3.0.0" + sdk: '>=2.18.1 <3.0.0' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -33,7 +35,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.4 + cupertino_icons: ^1.0.5 flutter_native_splash: path: .. @@ -46,7 +48,7 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^1.0.4 + flutter_lints: ^2.0.1 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec @@ -113,7 +115,8 @@ flutter_native_splash: image: assets/logo_lockup_flutter_vertical.png # The branding property allows you to specify an image used as branding in the splash screen. - # It must be a png file. Currently, it is only supported for Android < v12 and iOS. + # It must be a png file. It is supported for Android, iOS and the Web. For Android 12, + # see the Android 12 section below. #branding: assets/dart.png # To position the branding image at the bottom of the screen you can use bottom, bottomRight, @@ -134,25 +137,29 @@ flutter_native_splash: # https://developer.android.com/guide/topics/ui/splash-screen # Following are Android 12 specific parameter. android_12: - # The image parameter sets the splash screen icon image. If this parameter is not specified, - # the app's launcher icon will be used instead. - # App icon with an icon background: This should be 960×960 pixels, and fit within a circle - # 640 pixels in diameter. - # App icon without an icon background: This should be 1152×1152 pixels, and fit within a circle - # 768 pixels in diameter. + # The image parameter sets the splash screen icon image. If this parameter is not specified, + # the app's launcher icon will be used instead. + # Please note that the splash screen will be clipped to a circle on the center of the screen. + # App icon with an icon background: This should be 960×960 pixels, and fit within a circle + # 640 pixels in diameter. + # App icon without an icon background: This should be 1152×1152 pixels, and fit within a circle + # 768 pixels in diameter. image: assets/android12splash.png - # Splash screen background color. + # Splash screen background color. color: "#42a5f5" - # App icon background color. + # App icon background color. icon_background_color: "#eeeeee" - # The image_dark parameter and icon_background_color_dark set the image and icon background - # color when the device is in dark mode. If they are not specified, the app will use the - # parameters from above. - #image_dark: assets/android12splash-invert.png - #color_dark: "#042a49" + # The branding property allows you to specify an image used as branding in the splash screen. + #branding: assets/dart.png + + # The image_dark, color_dark, icon_background_color_dark, and branding_dark set values that + # apply when the device is in dark mode. If they are not specified, the app will use the + # parameters from above. + #image_dark: assets/android12splash-invert.png + #color_dark: "#042a49" #icon_background_color_dark: "#111111" # The android, ios and web parameters can be used to disable generating a splash screen on a given @@ -161,6 +168,25 @@ flutter_native_splash: #ios: false #web: false + # Platform specific images can be specified with the following parameters, which will override + # the respective image parameter. You may specify all, selected, or none of these parameters: + #image_android: assets/splash-android.png + #image_dark_android: assets/splash-invert-android.png + #image_ios: assets/splash-ios.png + #image_dark_ios: assets/splash-invert-ios.png + #image_web: assets/splash-web.png + #image_dark_web: assets/splash-invert-web.png + #background_image_android: "assets/background-android.png" + #background_image_dark_android: "assets/dark-background-android.png" + #background_image_ios: "assets/background-ios.png" + #background_image_dark_ios: "assets/dark-background-ios.png" + #background_image_web: "assets/background-web.png" + #background_image_dark_web: "assets/dark-background-web.png" + #branding_android: assets/brand-android.png + #branding_dark_android: assets/dart_dark-android.png + #branding_ios: assets/brand-ios.png + #branding_dark_ios: assets/dart_dark-ios.png + # The position of the splash image can be set with android_gravity, ios_content_mode, and # web_image_mode parameters. All default to center. # @@ -184,7 +210,7 @@ flutter_native_splash: # https://developer.android.com/guide/topics/manifest/activity-element#screen #android_screen_orientation: sensorLandscape - # To hide the notification bar, use the fullscreen parameter. Has no affect in web since web + # To hide the notification bar, use the fullscreen parameter. Has no effect in web since web # has no notification bar. Defaults to false. # NOTE: Unlike Android, iOS will not automatically show the notification bar when the app loads. # To show the notification bar, add the following code to your Flutter app: diff --git a/pubspec.yaml b/pubspec.yaml index 64e5392..659baf9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,13 +1,13 @@ name: flutter_native_splash description: Customize Flutter's default white native splash screen with background color and splash image. Supports dark mode, full screen, and more. -version: 2.2.9 +version: 2.2.10 repository: https://github.com/jonbhanson/flutter_native_splash issue_tracker: https://github.com/jonbhanson/flutter_native_splash/issues environment: - sdk: ">=2.15.1 <3.0.0" - flutter: ">=1.17.0" + sdk: '>=2.18.1 <3.0.0' + flutter: ">=2.5.0" dependencies: args: ^2.3.1 @@ -16,24 +16,29 @@ dependencies: flutter_web_plugins: sdk: flutter html: ^0.15.0 - image: ^3.1.3 + image: ^3.2.0 js: ^0.6.4 - lint: ^1.8.2 - meta: ^1.7.0 - path: ^1.8.1 + meta: ^1.8.0 + path: ^1.8.2 universal_io: ^2.0.4 xml: ^6.1.0 yaml: ^3.1.1 dev_dependencies: - flutter_lints: ^2.0.1 flutter_test: sdk: flutter + flutter_lints: ^2.0.1 flutter: # This section identifies this Flutter project as a plugin project. - # The 'pluginClass' and Android 'package' identifiers should not ordinarily - # be modified. They are used by the tooling to maintain consistency when + # The 'pluginClass' specifies the class (in Java, Kotlin, Swift, Objective-C, etc.) + # which should be registered in the plugin registry. This is required for + # using method channels. + # The Android 'package' specifies package in which the registered class is. + # This is required for using method channels on Android. + # The 'ffiPlugin' specifies that native code should be built and bundled. + # This is required for using `dart:ffi`. + # All these are used by the tooling to maintain consistency when # adding or updating assets for this project. plugin: platforms: