Skip to content

Fix conflict and update readme. - #1

Open
ndlinh-celtic wants to merge 57 commits into
romainboucher:feat/add-android-featuresfrom
NinePointsVietnam:master
Open

Fix conflict and update readme.#1
ndlinh-celtic wants to merge 57 commits into
romainboucher:feat/add-android-featuresfrom
NinePointsVietnam:master

Conversation

@ndlinh-celtic

Copy link
Copy Markdown

This PR fix many conflict with current upstream master branch.

WeScan still not support batch scanning, so multiple page scanning is impossible right now.

dependabot Bot and others added 30 commits April 15, 2024 07:40
Bumps [path_provider](https://github.com/flutter/packages/tree/main/packages/path_provider) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/path_provider-v2.1.3/packages/path_provider)

---
updated-dependencies:
- dependency-name: path_provider
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [cupertino_icons](https://github.com/flutter/packages/tree/main/third_party/packages) from 1.0.6 to 1.0.8.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/cupertino_icons-v1.0.8/third_party/packages)

---
updated-dependencies:
- dependency-name: cupertino_icons
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [cunning_document_scanner](https://github.com/jachzen/cunning_document_scanner) from 1.2.0 to 1.2.2.
- [Release notes](https://github.com/jachzen/cunning_document_scanner/releases)
- [Changelog](https://github.com/jachzen/cunning_document_scanner/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jachzen/cunning_document_scanner/commits)

---
updated-dependencies:
- dependency-name: cunning_document_scanner
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…ath_provider-2.1.3

Bump path_provider from 2.1.2 to 2.1.3 in /example
…upertino_icons-1.0.8

Bump cupertino_icons from 1.0.6 to 1.0.8 in /example
…unning_document_scanner-1.2.2

Bump cunning_document_scanner from 1.2.0 to 1.2.2 in /example
Bumps [flutter_lints](https://github.com/flutter/packages/tree/main/packages) from 3.0.2 to 4.0.0.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/flutter_lints-v4.0.0/packages)

---
updated-dependencies:
- dependency-name: flutter_lints
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [flutter_lints](https://github.com/flutter/packages/tree/main/packages) from 3.0.2 to 4.0.0.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/flutter_lints-v4.0.0/packages)

---
updated-dependencies:
- dependency-name: flutter_lints
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…lutter_lints-4.0.0

Bump flutter_lints from 3.0.2 to 4.0.0 in /example
…ints-4.0.0

Bump flutter_lints from 3.0.2 to 4.0.0
Bumps [path_provider](https://github.com/flutter/packages/tree/main/packages/path_provider) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/path_provider-v2.1.4/packages/path_provider)

---
updated-dependencies:
- dependency-name: path_provider
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…ath_provider-2.1.4

Bump path_provider from 2.1.3 to 2.1.4 in /example
Bumps [flutter_lints](https://github.com/flutter/packages/tree/main/packages) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/flutter_lints-v5.0.0/packages)

---
updated-dependencies:
- dependency-name: flutter_lints
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [flutter_lints](https://github.com/flutter/packages/tree/main/packages) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/flutter_lints-v5.0.0/packages)

---
updated-dependencies:
- dependency-name: flutter_lints
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…ints-5.0.0

Bump flutter_lints from 4.0.0 to 5.0.0
…lutter_lints-5.0.0

Bump flutter_lints from 4.0.0 to 5.0.0 in /example
Bumps [cunning_document_scanner](https://github.com/jachzen/cunning_document_scanner) from 1.2.3 to 1.3.0.
- [Release notes](https://github.com/jachzen/cunning_document_scanner/releases)
- [Changelog](https://github.com/jachzen/cunning_document_scanner/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jachzen/cunning_document_scanner/commits)

---
updated-dependencies:
- dependency-name: cunning_document_scanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [path_provider](https://github.com/flutter/packages/tree/main/packages/path_provider) from 2.1.4 to 2.1.5.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/path_provider-v2.1.5/packages/path_provider)

---
updated-dependencies:
- dependency-name: path_provider
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…unning_document_scanner-1.3.0

Bump cunning_document_scanner from 1.2.3 to 1.3.0 in /example
…ath_provider-2.1.5

Bump path_provider from 2.1.4 to 2.1.5 in /example
vicajilau and others added 23 commits April 11, 2025 18:34
Bumps [path_provider](https://github.com/flutter/packages/tree/main/packages/path_provider) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/path_provider-v2.1.3/packages/path_provider)

---
updated-dependencies:
- dependency-name: path_provider
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [cupertino_icons](https://github.com/flutter/packages/tree/main/third_party/packages) from 1.0.6 to 1.0.8.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/cupertino_icons-v1.0.8/third_party/packages)

---
updated-dependencies:
- dependency-name: cupertino_icons
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [flutter_lints](https://github.com/flutter/packages/tree/main/packages) from 3.0.2 to 4.0.0.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/flutter_lints-v4.0.0/packages)

---
updated-dependencies:
- dependency-name: flutter_lints
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [flutter_lints](https://github.com/flutter/packages/tree/main/packages) from 3.0.2 to 4.0.0.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/flutter_lints-v4.0.0/packages)

---
updated-dependencies:
- dependency-name: flutter_lints
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [path_provider](https://github.com/flutter/packages/tree/main/packages/path_provider) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/path_provider-v2.1.4/packages/path_provider)

---
updated-dependencies:
- dependency-name: path_provider
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [flutter_lints](https://github.com/flutter/packages/tree/main/packages) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/flutter_lints-v5.0.0/packages)

---
updated-dependencies:
- dependency-name: flutter_lints
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [flutter_lints](https://github.com/flutter/packages/tree/main/packages) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/flutter_lints-v5.0.0/packages)

---
updated-dependencies:
- dependency-name: flutter_lints
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [cunning_document_scanner](https://github.com/jachzen/cunning_document_scanner) from 1.2.3 to 1.3.0.
- [Release notes](https://github.com/jachzen/cunning_document_scanner/releases)
- [Changelog](https://github.com/jachzen/cunning_document_scanner/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jachzen/cunning_document_scanner/commits)

---
updated-dependencies:
- dependency-name: cunning_document_scanner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [path_provider](https://github.com/flutter/packages/tree/main/packages/path_provider) from 2.1.4 to 2.1.5.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/path_provider-v2.1.5/packages/path_provider)

---
updated-dependencies:
- dependency-name: path_provider
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
- Updated CunningScannerOptions to include new properties for WeScan integration.
- Modified SwiftCunningDocumentScannerPlugin to handle new scanner options.
- Refactored iOS options in Dart to support additional parameters.
- Improved method calls to accommodate new options for better user experience.
…rt dynamic page count and gallery import settings
# Conflicts:
#	example/ios/Podfile.lock
#	example/ios/Runner.xcodeproj/project.pbxproj
#	example/lib/main.dart
#	ios/Classes/CunningScannerOptions.swift
#	ios/Classes/SwiftCunningDocumentScannerPlugin.swift
#	lib/cunning_document_scanner.dart
#	lib/ios_options.dart
…cluding default page count and gallery import settings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants