diff --git a/.gitignore b/.gitignore index 7bf00e8..ad31382 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,8 @@ pubspec.lock # Directory created by dartdoc # If you don't generate documentation locally you can remove this line. doc/api/ + +qrcode/android/.project +qrcode/example/android/.project +.DS_Store +qrcode/android/.idea diff --git a/qrcode/android/.idea/codeStyles/Project.xml b/qrcode/android/.idea/codeStyles/Project.xml deleted file mode 100644 index 681f41a..0000000 --- a/qrcode/android/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - \ No newline at end of file diff --git a/qrcode/android/.idea/gradle.xml b/qrcode/android/.idea/gradle.xml deleted file mode 100644 index cbed508..0000000 --- a/qrcode/android/.idea/gradle.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/qrcode/android/.idea/misc.xml b/qrcode/android/.idea/misc.xml deleted file mode 100644 index 4872587..0000000 --- a/qrcode/android/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/qrcode/android/.idea/modules.xml b/qrcode/android/.idea/modules.xml deleted file mode 100644 index e54e28e..0000000 --- a/qrcode/android/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/qrcode/android/.idea/runConfigurations.xml b/qrcode/android/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/qrcode/android/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/qrcode/android/.idea/vcs.xml b/qrcode/android/.idea/vcs.xml deleted file mode 100644 index b2bdec2..0000000 --- a/qrcode/android/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/qrcode/android/.project b/qrcode/android/.project deleted file mode 100644 index ba6c0b6..0000000 --- a/qrcode/android/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - qrcode - Project qrcode created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/qrcode/android/.settings/org.eclipse.buildship.core.prefs b/qrcode/android/.settings/org.eclipse.buildship.core.prefs index 6aa97a9..d03f8ba 100644 --- a/qrcode/android/.settings/org.eclipse.buildship.core.prefs +++ b/qrcode/android/.settings/org.eclipse.buildship.core.prefs @@ -1,2 +1,13 @@ -connection.project.dir=../example/android +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.0-rc-1)) +connection.project.dir= eclipse.preferences.version=1 +gradle.user.home= +java.home=/Library/Java/JavaVirtualMachines/jdk-12.0.1.jdk/Contents/Home +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/qrcode/android/build.gradle b/qrcode/android/build.gradle index 93d087e..7dc6eed 100644 --- a/qrcode/android/build.gradle +++ b/qrcode/android/build.gradle @@ -2,14 +2,14 @@ group 'com.example.qrcode' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.3.10' + ext.kotlin_version = '1.5.21' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:7.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -27,13 +27,13 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 28 + compileSdkVersion 29 sourceSets { main.java.srcDirs += 'src/main/kotlin' } defaultConfig { - minSdkVersion 16 + minSdkVersion 21 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } lintOptions { @@ -43,6 +43,7 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "com.journeyapps:zxing-android-embedded:4.1.0" - implementation "androidx.appcompat:appcompat:1.0.2" + implementation('com.journeyapps:zxing-android-embedded:4.2.0') { transitive = false } + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'com.google.zxing:core:3.3.0' } diff --git a/qrcode/android/gradle/wrapper/gradle-wrapper.jar b/qrcode/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/qrcode/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/qrcode/android/gradle/wrapper/gradle-wrapper.properties b/qrcode/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..0f80bbf --- /dev/null +++ b/qrcode/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/qrcode/android/gradlew b/qrcode/android/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/qrcode/android/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/qrcode/android/gradlew.bat b/qrcode/android/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/qrcode/android/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/qrcode/example/.flutter-plugins-dependencies b/qrcode/example/.flutter-plugins-dependencies deleted file mode 100644 index c398752..0000000 --- a/qrcode/example/.flutter-plugins-dependencies +++ /dev/null @@ -1 +0,0 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"qrcode","path":"/home/vytor/projetos/mobile/qrcode/qrcode/","dependencies":[]}],"android":[{"name":"qrcode","path":"/home/vytor/projetos/mobile/qrcode/qrcode/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"qrcode","dependencies":[]}],"date_created":"2020-06-24 16:02:25.633378","version":"1.17.3"} \ No newline at end of file diff --git a/qrcode/example/android/.project b/qrcode/example/android/.project deleted file mode 100644 index 3964dd3..0000000 --- a/qrcode/example/android/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - android - Project android created by Buildship. - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/qrcode/example/android/.settings/org.eclipse.buildship.core.prefs b/qrcode/example/android/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index e889521..0000000 --- a/qrcode/example/android/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir= -eclipse.preferences.version=1 diff --git a/qrcode/example/ios/Flutter/flutter_export_environment.sh b/qrcode/example/ios/Flutter/flutter_export_environment.sh deleted file mode 100755 index cdfc81a..0000000 --- a/qrcode/example/ios/Flutter/flutter_export_environment.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/home/vytor/flutter" -export "FLUTTER_APPLICATION_PATH=/home/vytor/projetos/mobile/qrcode/qrcode/example" -export "FLUTTER_TARGET=lib/main.dart" -export "FLUTTER_BUILD_DIR=build" -export "SYMROOT=${SOURCE_ROOT}/../build/ios" -export "OTHER_LDFLAGS=$(inherited) -framework Flutter" -export "FLUTTER_FRAMEWORK_DIR=/home/vytor/flutter/bin/cache/artifacts/engine/ios" -export "FLUTTER_BUILD_NAME=1.0.0" -export "FLUTTER_BUILD_NUMBER=1" diff --git a/qrcode/lib/qrcode.dart b/qrcode/lib/qrcode.dart index f7b61d6..176ffdf 100644 --- a/qrcode/lib/qrcode.dart +++ b/qrcode/lib/qrcode.dart @@ -8,28 +8,28 @@ typedef CaptureCallback(String data); enum CaptureTorchMode { on, off } class QRCaptureController { - MethodChannel _methodChannel; - CaptureCallback _capture; - + late MethodChannel _methodChannel; + CaptureCallback? _capture; + QRCaptureController(); void _onPlatformViewCreated(int id) { _methodChannel = MethodChannel('plugins/qr_capture/method_$id'); _methodChannel.setMethodCallHandler((MethodCall call) async { - if (call.method == 'onCaptured') { + if (call.method == 'onCaptured') { if (_capture != null && call.arguments != null) { - _capture(call.arguments.toString()); + _capture!(call.arguments.toString()); } } }); } void pause() { - _methodChannel?.invokeMethod('pause'); + _methodChannel.invokeMethod('pause'); } void resume() { - _methodChannel?.invokeMethod('resume'); + _methodChannel.invokeMethod('resume'); } void onCapture(CaptureCallback capture) { @@ -38,13 +38,13 @@ class QRCaptureController { set torchMode(CaptureTorchMode mode) { var isOn = mode == CaptureTorchMode.on; - _methodChannel?.invokeMethod('setTorchMode', isOn); + _methodChannel.invokeMethod('setTorchMode', isOn); } } class QRCaptureView extends StatefulWidget { final QRCaptureController controller; - QRCaptureView({Key key, this.controller}) : super(key: key); + QRCaptureView({Key? key, required this.controller}) : super(key: key); @override State createState() { @@ -53,19 +53,19 @@ class QRCaptureView extends StatefulWidget { } class QRCaptureViewState extends State { - @override Widget build(BuildContext context) { if (Platform.isIOS) { return UiKitView( - viewType: 'plugins/qr_capture_view', - creationParamsCodec: StandardMessageCodec(), - onPlatformViewCreated: (id) { + viewType: 'plugins/qr_capture_view', + creationParamsCodec: StandardMessageCodec(), + onPlatformViewCreated: (id) { widget.controller._onPlatformViewCreated(id); }, ); } else { - return AndroidView(viewType: 'plugins/qr_capture_view', + return AndroidView( + viewType: 'plugins/qr_capture_view', creationParamsCodec: StandardMessageCodec(), onPlatformViewCreated: (id) { widget.controller._onPlatformViewCreated(id); @@ -73,4 +73,4 @@ class QRCaptureViewState extends State { ); } } -} \ No newline at end of file +} diff --git a/qrcode/pubspec.yaml b/qrcode/pubspec.yaml index d96f9a4..f8d8cc5 100644 --- a/qrcode/pubspec.yaml +++ b/qrcode/pubspec.yaml @@ -5,7 +5,7 @@ author: chendaxin homepage: https://github.com/SiriDx/qrcode environment: - sdk: ">=2.1.0 <3.0.0" + sdk: '>=2.12.0 <3.0.0' dependencies: flutter: