Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade zxing library #46

Closed
wants to merge 1 commit into from
Closed

Upgrade zxing library #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
Expand All @@ -11,7 +11,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
flatDir {
dirs 'libs'
}
Expand All @@ -26,7 +26,7 @@ android {
buildToolsVersion "33.0.2"
compileSdkVersion 30
defaultConfig {
minSdkVersion 22
minSdkVersion 24
targetSdkVersion 34
versionCode 18
versionName "1.0.13"
Expand All @@ -39,7 +39,6 @@ android {

dependencies {
implementation ':wormhole-william@aar'
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.google.zxing:core:3.2.1'
implementation 'com.journeyapps:zxing-android-embedded:3.2.0@aar'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
}
2 changes: 2 additions & 0 deletions android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
android.useAndroidX=true

3 changes: 1 addition & 2 deletions android/src/main/java/io/sanford/wormholewilliam/Scan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ public void run() {

@Override public void onAttach(Context ctx) {
super.onAttach(ctx);

IntentIntegrator integrator = IntentIntegrator.forFragment(this);
integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE_TYPES);
integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE);
integrator.setPrompt("Scan");
integrator.setCameraId(0);
integrator.setBeepEnabled(false);
Expand Down
Loading