diff --git a/app/build.gradle b/app/build.gradle index 767a759..2bbab90 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,15 +27,14 @@ android { } dependencies { - def room_version = "1.1.1" implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':liband') - implementation 'com.android.support:support-v4:28.0.0-rc02' - implementation 'com.android.support:appcompat-v7:28.0.0-rc02' - implementation 'com.android.support.constraint:constraint-layout:1.1.2' - implementation "android.arch.persistence.room:runtime:$room_version" - annotationProcessor "android.arch.persistence.room:compiler:$room_version" - testImplementation "android.arch.persistence.room:testing:$room_version" + implementation 'com.android.support:support-v4:28.0.0' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation "android.arch.persistence.room:runtime:1.1.1" + annotationProcessor "android.arch.persistence.room:compiler:1.1.1" + testImplementation "android.arch.persistence.room:testing:1.1.1" } repositories { mavenCentral() diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0efe337..20e1a23 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,24 +1,24 @@ - + + - + android:theme="@style/AppTheme"> + - \ No newline at end of file diff --git a/app/src/main/java/com/libandexample/Main2Activity.java b/app/src/main/java/com/libandexample/Main2Activity.java index 469d976..d2728b4 100644 --- a/app/src/main/java/com/libandexample/Main2Activity.java +++ b/app/src/main/java/com/libandexample/Main2Activity.java @@ -1,17 +1,62 @@ package com.libandexample; +import android.app.Activity; +import android.content.Intent; +import android.graphics.Bitmap; +import android.net.Uri; +import android.os.Environment; +import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.ImageView; import com.liband.utils.Utils; +import java.io.File; + public class Main2Activity extends AppCompatActivity { + ImageView imageView; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main2); + + Button button = findViewById(R.id.button); + imageView = findViewById(R.id.imageView); + button.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent("com.intsig.camscanner.ACTION_SCAN"); + // Or content uri picked from gallery + + Uri uri = Uri.fromFile(new File(Environment.getExternalStorageDirectory().getPath() + "/source.jpg")); + intent.putExtra(Intent.EXTRA_STREAM, uri); + intent.putExtra("scanned_image", Environment.getExternalStorageDirectory().getPath() + "/source.jpg"); +// intent.putExtra("pdf_path", Environment.getExternalStorageDirectory().getPath() + "/source.jpg"); +// intent.putExtra("org_image", Environment.getExternalStorageDirectory().getPath() + "/source.jpg"); + startActivityForResult(intent, 100); + } + }); + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == 100) { + int responseCode = data.getIntExtra("RESULT_OK", -1); + if (requestCode == Activity.RESULT_OK) { + Bitmap imageBitmap = (Bitmap) data.getExtras().get("data"); + imageView.setImageBitmap(imageBitmap); + } else if (resultCode == Activity.RESULT_FIRST_USER) { + // Fail + } else if (resultCode == Activity.RESULT_CANCELED) { + // User canceled + } + } } } diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml index 7931393..3af9c5e 100644 --- a/app/src/main/res/layout/activity_main2.xml +++ b/app/src/main/res/layout/activity_main2.xml @@ -8,7 +8,7 @@