Skip to content

Commit ab27c1c

Browse files
committed
fixed crashes
1 parent 7fac1a2 commit ab27c1c

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@
88
**/build
99
/captures
1010
.externalNativeBuild
11+
/documentscanner-release
12+

.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

.idea/caches/gradle_models.ser

-59.6 KB
Binary file not shown.

app/src/main/java/com/haotran/testing/MainActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected void onCreate(Bundle savedInstanceState) {
3131
setContentView(R.layout.activity_main);
3232
scannedImageView = findViewById(R.id.scanned_image);
3333

34-
// startCapture();
34+
startScan();
3535
findViewById(R.id.button).setOnClickListener(new View.OnClickListener() {
3636
@Override
3737
public void onClick(View view) {

documentscanner/build.gradle

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ android {
1717
ndk {
1818
moduleName = "liveedgedetection"
1919
stl = "gnustl_static"
20-
abiFilters 'arm64-v8a', 'armeabi', 'armeabi-v7a', 'mips', 'mips64', 'x86', 'x86_64'
20+
abiFilters 'arm64-v8a', 'armeabi', 'armeabi-v7a' //, 'mips', 'mips64', 'x86', 'x86_64'
2121
}
2222
}
2323

@@ -32,11 +32,12 @@ android {
3232

3333
dependencies {
3434
implementation fileTree(include: ['*.jar'], dir: 'libs')
35-
// implementation 'com.android.support:appcompat-v7:26.1.0'
36-
implementation "androidx.appcompat:appcompat:1.0.2"
35+
implementation 'com.android.support:appcompat-v7:26.1.0'
36+
3737
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
3838
def support_lib_version = '1.0.0'
39-
implementation "com.google.android.material:material:$support_lib_version"
39+
// implementation "androidx.appcompat:appcompat:1.0.2"
40+
// implementation "com.google.android.material:material:$support_lib_version"
4041
testImplementation 'junit:junit:4.12'
4142
androidTestImplementation 'com.android.support.test:runner:1.0.1'
4243
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'

documentscanner/src/main/java/com/haotran/documentscanner/view/TouchImageView.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import android.os.Build.VERSION_CODES;
2727
import android.os.Bundle;
2828
import android.os.Parcelable;
29+
import android.support.v7.widget.AppCompatImageView;
2930
import android.util.AttributeSet;
3031
import android.util.Log;
3132
import android.view.GestureDetector;
@@ -36,12 +37,13 @@
3637
import android.widget.OverScroller;
3738
import android.widget.Scroller;
3839

40+
3941
import com.haotran.documentscanner.util.ScanUtils;
4042

4143
/**
4244
* This class provides pinch to zoom capability to an image
4345
*/
44-
public class TouchImageView extends android.support.v7.widget.AppCompatImageView {
46+
public class TouchImageView extends AppCompatImageView {
4547

4648
private static final String DEBUG = "DEBUG";
4749

0 commit comments

Comments
 (0)