Skip to content

Commit 6e5aecf

Browse files
authored
Use Code Scanner and remove Zxing, bump versions (#427)
1 parent c69e05c commit 6e5aecf

37 files changed

+43
-4015
lines changed

LICENSE-zxing

Lines changed: 0 additions & 245 deletions
This file was deleted.

gradle/android_project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
google()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:8.8.2'
7+
classpath 'com.android.tools.build:gradle:8.11.0'
88
}
99
}
1010

gradle/android_project/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip

modules/barcode-scan/src/main/java/com/gluonhq/attach/barcodescan/BarcodeScanService.java

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, 2022, Gluon
2+
* Copyright (c) 2016, 2025, Gluon
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License as published by
@@ -54,29 +54,7 @@
5454
* when used.</p>
5555
*
5656
* <p><b>Android Configuration</b></p>
57-
* <p>The permission <code>android.permission.CAMERA</code> needs to be added together
58-
* with the following <code>activity</code> configuration that handles the SCAN intent
59-
* of the BarcodeScanService.</p>
60-
*
61-
* <pre>
62-
* {@code <manifest ...>
63-
* <uses-permission android:name="android.permission.CAMERA"/>
64-
* ...
65-
* <application ...>
66-
* ...
67-
* <activity android:name="com.gluonhq.helloandroid.zxing.CaptureActivity"
68-
* android:screenOrientation="sensorLandscape"
69-
* android:clearTaskOnLaunch="true"
70-
* android:stateNotNeeded="true"
71-
* android:windowSoftInputMode="stateAlwaysHidden">
72-
* <intent-filter>
73-
* <action android:name="com.gluonhq.attach.barcodescan.android.SCAN"/>
74-
* <category android:name="android.intent.category.DEFAULT"/>
75-
* </intent-filter>
76-
* </activity>
77-
* <activity android:name="com.gluonhq.impl.attach.plugins.android.PermissionRequestActivity" />
78-
* </application>
79-
* </manifest>}</pre>
57+
* <p>None</p>
8058
*
8159
* <p><b>iOS Configuration</b></p>
8260
*

modules/barcode-scan/src/main/java/com/gluonhq/attach/barcodescan/impl/AndroidBarcodeScanService.java

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, 2022, Gluon
2+
* Copyright (c) 2016, 2025, Gluon
33
*
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License as published by
@@ -36,27 +36,6 @@
3636

3737
import java.util.Optional;
3838

39-
/**
40-
* Requires this permission: android.permission.CAMERA
41-
*
42-
* And this activity added to the AndroidManifest.xml:
43-
*
44-
* <pre>
45-
* {@code
46-
* <activity android:name="com.gluonhq.helloandroid.zxing.CaptureActivity"
47-
* android:screenOrientation="sensorLandscape"
48-
* android:clearTaskOnLaunch="true"
49-
* android:stateNotNeeded="true"
50-
* android:windowSoftInputMode="stateAlwaysHidden">
51-
* <intent-filter>
52-
* <action android:name="com.gluonhq.attach.barcodescan.android.SCAN"/>
53-
* <category android:name="android.intent.category.DEFAULT"/>
54-
* </intent-filter>
55-
* </activity>
56-
* <activity android:name="com.gluonhq.helloandroid.PermissionRequestActivity" />
57-
* }
58-
* </pre>
59-
*/
6039
public class AndroidBarcodeScanService implements BarcodeScanService {
6140

6241
static {

0 commit comments

Comments
 (0)