diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 8653f7fd..00000000 --- a/.editorconfig +++ /dev/null @@ -1,80 +0,0 @@ -# EditorConfig is awesome:http://EditorConfig.org - -# top-most EditorConfig file -root = true - -# Don't use tabs for indentation. -[*] -indent_style = space -# (Please don't specify an indent_size here; that has too many unintended consequences.) - -# Code files -[*.{cs,csx,vb,vbx}] -indent_size = 4 -insert_final_newline = true -charset = utf-8-bom - -# Xml project files -[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}] -indent_size = 2 - -# Xml config files -[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}] -indent_size = 2 - -# JSON files -[*.json] -indent_size = 2 - -# Dotnet code style settings: -[*.{cs,vb}] -# Sort using and Import directives with System.* appearing first -dotnet_sort_system_directives_first = true -# Avoid "this." and "Me." if not necessary -dotnet_style_qualification_for_field = false:suggestion -dotnet_style_qualification_for_property = false:suggestion -dotnet_style_qualification_for_method = false:suggestion -dotnet_style_qualification_for_event = false:suggestion - -# Use language keywords instead of framework type names for type references -dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion -dotnet_style_predefined_type_for_member_access = true:suggestion - -# Suggest more modern language features when available -dotnet_style_object_initializer = true:suggestion -dotnet_style_collection_initializer = true:suggestion -dotnet_style_coalesce_expression = true:suggestion -dotnet_style_null_propagation = true:suggestion -dotnet_style_explicit_tuple_names = true:suggestion - -# CSharp code style settings: -[*.cs] -# Prefer "var" everywhere -csharp_style_var_for_built_in_types = true:suggestion -csharp_style_var_when_type_is_apparent = true:suggestion -csharp_style_var_elsewhere = true:suggestion - -# Prefer method-like constructs to have a block body -csharp_style_expression_bodied_methods = false:none -csharp_style_expression_bodied_constructors = false:none -csharp_style_expression_bodied_operators = false:none - -# Prefer property-like constructs to have an expression-body -csharp_style_expression_bodied_properties = true:none -csharp_style_expression_bodied_indexers = true:none -csharp_style_expression_bodied_accessors = true:none - -# Suggest more modern language features when available -csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion -csharp_style_pattern_matching_over_as_with_null_check = true:suggestion -csharp_style_inlined_variable_declaration = true:suggestion -csharp_style_throw_expression = true:suggestion -csharp_style_conditional_delegate_call = true:suggestion - -# Newline settings -csharp_new_line_before_open_brace = all -csharp_new_line_before_else = true -csharp_new_line_before_catch = true -csharp_new_line_before_finally = true -csharp_new_line_before_members_in_object_initializers = true -csharp_new_line_before_members_in_anonymous_types = true diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index a9ad392a..00000000 --- a/.gitattributes +++ /dev/null @@ -1,39 +0,0 @@ -# This file is understood by git 1.7.2+. - -# Windows specific files should always be crlf on checkout -*.bat text eol=crlf -*.cmd text eol=crlf -*.ps1 text eol=crlf - -# Check out the following as ln always for osx/linux/cygwin -*.sh text eol=lf - -# Opt in the following types to always normalize line endings -# on checkin and always use native endings on checkout. -*.config text -*.cs text diff=csharp -*.csproj text -*.md text -*.msbuild text -*.nuspec text -*.pp text -*.ps1 text -*.sln text -*.tt text -*.txt text -*.xaml text -*.xml text - -# Binary files -*.bmp binary -*.jpeg binary -*.jpg binary -*.nupkg binary -*.png binary -*.sdf binary - -*.java linguist-language=Dart -*.kt linguist-language=Dart -*.swift linguist-language=Dart -*.m linguist-language=Dart -*.h linguist-language=Dart diff --git a/.github/workflows/app_facing_package.yaml b/.github/workflows/app_facing_package.yaml index 99f32024..894419bf 100644 --- a/.github/workflows/app_facing_package.yaml +++ b/.github/workflows/app_facing_package.yaml @@ -26,7 +26,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -40,7 +40,7 @@ jobs: # Run Flutter Format to ensure formatting is valid - name: Run Flutter Format - run: flutter format --set-exit-if-changed . + run: dart format --set-exit-if-changed . working-directory: ${{env.source-directory}} analyze: @@ -55,7 +55,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -85,12 +85,13 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Ensure correct JAVA version is installed. - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: - java-version: '12.x' + distribution: 'zulu' + java-version: '17' # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -120,7 +121,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -150,7 +151,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -185,7 +186,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -224,7 +225,7 @@ jobs: - run: sudo apt-get install -y ninja-build libgtk-3-dev libblkid-dev # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -264,7 +265,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -292,7 +293,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -310,8 +311,8 @@ jobs: working-directory: ${{env.source-directory}} # Upload code coverage information - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v3 with: - file: ${{env.source-directory}}/coverage/lcov.info # optional - name: CachedNetworkImage (App Facing Package) # optional - fail_ci_if_error: true \ No newline at end of file + files: ${{env.source-directory}}/coverage/lcov.info + name: CachedNetworkImage (App Facing Package) + fail_ci_if_error: true diff --git a/.github/workflows/platform_interface.yaml b/.github/workflows/platform_interface.yaml index 08e3e76e..439d8a1c 100644 --- a/.github/workflows/platform_interface.yaml +++ b/.github/workflows/platform_interface.yaml @@ -26,7 +26,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -40,7 +40,7 @@ jobs: # Run Flutter Format to ensure formatting is valid - name: Run Flutter Format - run: flutter format --set-exit-if-changed . + run: dart format --set-exit-if-changed . working-directory: ${{env.source-directory}} analyze: @@ -55,7 +55,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -83,7 +83,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -101,8 +101,8 @@ jobs: working-directory: ${{env.source-directory}} # Upload code coverage information - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v3 with: - file: ${{env.source-directory}}/coverage/lcov.info # optional - name: CachedNetworkImage (Platform interface) # optional - fail_ci_if_error: true \ No newline at end of file + files: ${{env.source-directory}}/coverage/lcov.info + name: CachedNetworkImage (Platform interface) + fail_ci_if_error: true diff --git a/.github/workflows/web.yaml b/.github/workflows/web.yaml index 6821a0cc..4d206cc3 100644 --- a/.github/workflows/web.yaml +++ b/.github/workflows/web.yaml @@ -26,7 +26,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -40,7 +40,7 @@ jobs: # Run Flutter Format to ensure formatting is valid - name: Run Flutter Format - run: flutter format --set-exit-if-changed . + run: dart format --set-exit-if-changed . working-directory: ${{env.source-directory}} analyze: @@ -55,7 +55,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -83,7 +83,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Make sure the stable version of Flutter is available - uses: subosito/flutter-action@v2 @@ -100,9 +100,9 @@ jobs: run: flutter test --platform chrome working-directory: ${{env.source-directory}} -# # Upload code coverage information -# - uses: codecov/codecov-action@v1 -# with: -# file: ${{env.source-directory}}/coverage/lcov.info # optional -# name: CachedNetworkImage (Web) # optional -# fail_ci_if_error: true \ No newline at end of file + # # Upload code coverage information + # - uses: codecov/codecov-action@v1 + # with: + # files: ${{env.source-directory}}/coverage/lcov.info + # name: CachedNetworkImage (Web) + # fail_ci_if_error: true diff --git a/cached_network_image/.gitignore b/cached_network_image/.gitignore new file mode 100644 index 00000000..24476c5d --- /dev/null +++ b/cached_network_image/.gitignore @@ -0,0 +1,44 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/cached_network_image/CHANGELOG.md b/cached_network_image/CHANGELOG.md index f9e93d6c..94f56b48 100644 --- a/cached_network_image/CHANGELOG.md +++ b/cached_network_image/CHANGELOG.md @@ -1,3 +1,11 @@ +## [3.3.0] - TBD +* Add error to ErrorListener +* Update to Dart 3 +* Add topics +* Specify types +* Update example +* Remove [`load`](https://github.com/flutter/flutter/pull/132679), use `loadImage` instead `loadBuffer` + ## [3.2.3] - 2022-11-25 * Correctly dispose image stream handler diff --git a/cached_network_image/analysis_options.yaml b/cached_network_image/analysis_options.yaml index efce4b27..f9b30346 100644 --- a/cached_network_image/analysis_options.yaml +++ b/cached_network_image/analysis_options.yaml @@ -1,11 +1 @@ include: package:flutter_lints/flutter.yaml -linter: - rules: - - public_member_api_docs - -analyzer: - exclude: - # Ignore generated files - - '**/*.g.dart' - - 'lib/src/generated/*.dart' - \ No newline at end of file diff --git a/cached_network_image/example/.gitignore b/cached_network_image/example/.gitignore index 56e50201..24476c5d 100644 --- a/cached_network_image/example/.gitignore +++ b/cached_network_image/example/.gitignore @@ -1,13 +1,44 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp .DS_Store .atom/ -.idea -.vscode/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies .packages +.pub-cache/ .pub/ -build/ -ios/.generated/ -packages -pubspec.lock -.flutter-plugins -.dart_tool/ -ios/Flutter/flutter_export_environment.sh \ No newline at end of file +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/cached_network_image/example/.metadata b/cached_network_image/example/.metadata deleted file mode 100644 index d63f0cf0..00000000 --- a/cached_network_image/example/.metadata +++ /dev/null @@ -1,8 +0,0 @@ -# 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. - -version: - revision: f0f0f097077729882f91f9c81a6310f229513aa1 - channel: master diff --git a/cached_network_image/example/README.md b/cached_network_image/example/README.md index b0b2117c..16fcb7a3 100644 --- a/cached_network_image/example/README.md +++ b/cached_network_image/example/README.md @@ -1,8 +1 @@ -# example - -A new Flutter project. - -## Getting Started - -For help getting started with Flutter, view our online -[documentation](http://flutter.io/). +# A project that showcases usage of cached_network_image diff --git a/cached_network_image/example/analysis_options.yaml b/cached_network_image/example/analysis_options.yaml index a3be6b82..f9b30346 100644 --- a/cached_network_image/example/analysis_options.yaml +++ b/cached_network_image/example/analysis_options.yaml @@ -1 +1 @@ -include: package:flutter_lints/flutter.yaml \ No newline at end of file +include: package:flutter_lints/flutter.yaml diff --git a/cached_network_image/example/android/.gitignore b/cached_network_image/example/android/.gitignore index 0a741cb4..6f568019 100644 --- a/cached_network_image/example/android/.gitignore +++ b/cached_network_image/example/android/.gitignore @@ -9,3 +9,5 @@ GeneratedPluginRegistrant.java # Remember to never publicly share your keystore. # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app key.properties +**/*.keystore +**/*.jks diff --git a/cached_network_image/example/android/app/build.gradle b/cached_network_image/example/android/app/build.gradle index ea99e202..542b077a 100644 --- a/cached_network_image/example/android/app/build.gradle +++ b/cached_network_image/example/android/app/build.gradle @@ -26,30 +26,33 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 31 + namespace "com.baseflow.example" + compileSdkVersion 34 + ndkVersion flutter.ndkVersion - sourceSets { - main.java.srcDirs += 'src/main/kotlin' + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' } - lintOptions { - disable 'InvalidPackage' + sourceSets { + main.java.srcDirs += 'src/main/kotlin' } defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.example" - minSdkVersion 16 - targetSdkVersion 31 + applicationId "com.baseflow.example" + minSdkVersion 23 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - ndkVersion = "21.1.6352462" } buildTypes { release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. signingConfig signingConfigs.debug } } diff --git a/cached_network_image/example/android/app/src/debug/AndroidManifest.xml b/cached_network_image/example/android/app/src/debug/AndroidManifest.xml index c208884f..399f6981 100644 --- a/cached_network_image/example/android/app/src/debug/AndroidManifest.xml +++ b/cached_network_image/example/android/app/src/debug/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/cached_network_image/example/android/app/src/main/AndroidManifest.xml b/cached_network_image/example/android/app/src/main/AndroidManifest.xml index 4f487c41..9c91a845 100644 --- a/cached_network_image/example/android/app/src/main/AndroidManifest.xml +++ b/cached_network_image/example/android/app/src/main/AndroidManifest.xml @@ -1,37 +1,29 @@ - - + package="com.baseflow.example"> + + + - - + android:name="io.flutter.embedding.android.NormalTheme" + android:resource="@style/NormalTheme" /> - - + + - +