add close scanner button

Author: kuamanet

.idea/gradle.xml

@@ -0,0 +1,7 @@
+# 0.1.1
+> 2020-07-21
+Added `onClose` abstract method to  `BaseScannerActivity`
+
+# 0.1
+> 2020-07-21
+First implementation

CHANGELOG.md

@@ -38,7 +38,11 @@ class ScannerActivity : BaseScannerActivity() {
     }
 
     override fun onDocumentAccepted(path: String) {
-        TODO("Do something with the path to the file")
+        Toast.makeText(this, path, Toast.LENGTH_LONG).show()
+    }
+
+    override fun onClose() {
+        finish()
     }
 }
 

README.md

@@ -92,6 +92,9 @@ abstract class BaseScannerActivity : AppCompatActivity() {
             onDocumentAccepted(viewModel.documentPath!!)
         }
 
+        closeScanner.setOnClickListener {
+            onClose()
+        }
         this.viewModel = viewModel
     }
 
@@ -112,4 +115,5 @@ abstract class BaseScannerActivity : AppCompatActivity() {
 
     abstract fun onError(throwable: Throwable)
     abstract fun onDocumentAccepted(path: String)
+    abstract fun onClose()
 }

app/src/main/java/net/kuama/documentscanner/presentation/BaseScannerActivity.kt

@@ -19,4 +19,8 @@ class ScannerActivity : BaseScannerActivity() {
     override fun onDocumentAccepted(path: String) {
         Toast.makeText(this, path, Toast.LENGTH_LONG).show()
     }
+
+    override fun onClose() {
+        finish()
+    }
 }

app/src/main/java/net/kuama/documentscanner/presentation/ScannerActivity.kt

@@ -63,6 +63,19 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/shutter" />
 
+    <ImageButton
+        android:id="@+id/closeScanner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="@null"
+        android:contentDescription="@string/close_document_preview"
+        android:src="@drawable/ic_close_24"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/previewWrap"
         android:layout_width="match_parent"

app/src/main/res/layout/activity_main.xml

@@ -19,5 +19,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-version_code=1
-version_name=0.1
+version_code=2
+version_name=0.1.1