Skip to content

Commit 18e2969

Browse files
dragos-dobredragos-dobre
authored
Finish release/v2.0.0
Finish release/v2.0.0
2 parents a7772e1 + 5292906 commit 18e2969

File tree

154 files changed

+10438
-2545
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+10438
-2545
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,6 @@ fastlane/readme.md
7474
.idea/sonarlint
7575

7676
# Visual Studio Code
77-
.vscode/
77+
.vscode/
78+
79+
release/

‎.idea/codeStyles/Project.xml‎

Lines changed: 112 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CaptureActivity/CaptureActivity.iml‎

Lines changed: 16 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
66
<option name="GRADLE_PROJECT_PATH" value=":CaptureActivity" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.0.1" />
8+
<option name="LAST_KNOWN_AGP_VERSION" value="3.0.1" />
79
</configuration>
810
</facet>
911
<facet type="android" name="Android">
@@ -17,7 +19,8 @@
1719
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1820
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1921
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
22+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug" />
23+
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
2124
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2225
<option name="PROJECT_TYPE" value="1" />
2326
</configuration>
@@ -29,19 +32,17 @@
2932
<exclude-output />
3033
<content url="file://$MODULE_DIR$">
3134
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3335
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3436
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3537
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
3840
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4041
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4142
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4243
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
44-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
4546
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4647
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4748
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
@@ -50,20 +51,20 @@
5051
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5152
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5253
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
57-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
58-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
59-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
6054
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
6155
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
6256
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
6357
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
6458
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
6559
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
6660
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
6768
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6869
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6970
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -85,29 +86,7 @@
8586
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8687
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8788
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
109-
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
110-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
89+
<excludeFolder url="file://$MODULE_DIR$/build" />
11190
</content>
11291
<orderEntry type="jdk" jdkName="Android API 7 Platform" jdkType="Android SDK" />
11392
<orderEntry type="sourceFolder" forTests="false" />

‎CaptureActivity/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.library'
22
android {
33
compileSdkVersion 7
4-
buildToolsVersion '27.0.3'
4+
buildToolsVersion '26.0.2'
55

66
defaultConfig {
77
minSdkVersion 7

‎CaptureActivity/src/main/java/com/google/zxing/client/android/CaptureActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
import com.google.zxing.Result;
2121
import com.google.zxing.ResultMetadataType;
2222
import com.google.zxing.ResultPoint;
23-
import com.google.zxing.client.android.camera.CameraManager;
2423
import com.google.zxing.client.android.history.HistoryActivity;
2524
import com.google.zxing.client.android.history.HistoryItem;
2625
import com.google.zxing.client.android.history.HistoryManager;
26+
27+
import com.google.zxing.client.android.camera.CameraManager;
2728
import com.google.zxing.client.android.result.ResultButtonListener;
2829
import com.google.zxing.client.android.result.ResultHandler;
2930
import com.google.zxing.client.android.result.ResultHandlerFactory;

‎CaptureActivity/src/main/java/com/google/zxing/client/android/CaptureActivityHandler.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.google.zxing.BarcodeFormat;
2020
import com.google.zxing.Result;
21+
2122
import com.google.zxing.client.android.camera.CameraManager;
2223

2324
import android.app.Activity;

‎CaptureActivity/src/main/java/com/google/zxing/client/android/PreferencesActivity.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import android.preference.PreferenceActivity;
2424
import android.preference.PreferenceScreen;
2525

26+
import com.google.zxing.client.android.R;
27+
2628
import java.util.ArrayList;
2729
import java.util.Collection;
2830

‎CaptureActivity/src/main/java/com/google/zxing/client/android/ViewfinderView.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.google.zxing.client.android;
1818

1919
import com.google.zxing.ResultPoint;
20+
2021
import com.google.zxing.client.android.camera.CameraManager;
2122

2223
import android.content.Context;

‎CaptureActivity/src/main/java/com/google/zxing/client/android/book/BrowseBookListener.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import android.net.Uri;
2121
import android.view.View;
2222
import android.widget.AdapterView;
23+
2324
import com.google.zxing.client.android.LocaleManager;
2425

2526
import java.util.List;

0 commit comments

Comments
 (0)