- fix: build problems

Author: Giovanni Nic

app/src/main/java/net/kuama/documentscanner/domain/FindPaperSheetContours.kt

@@ -1,23 +1,19 @@
 package net.kuama.documentscanner.domain
 
 import android.graphics.Bitmap
-import android.graphics.Matrix
-import kotlinx.coroutines.delay
 import net.kuama.documentscanner.support.Either
 import net.kuama.documentscanner.support.Left
 import net.kuama.documentscanner.support.Right
 import net.kuama.documentscanner.support.shape
 import net.kuama.scanner.data.Corners
 import org.opencv.android.Utils
 import org.opencv.core.*
-import org.opencv.imgcodecs.Imgcodecs
 import org.opencv.imgproc.Imgproc
 import java.util.*
 import kotlin.Comparator
 import kotlin.collections.ArrayList
 
-class FindPaperSheetContours : UseCase<Pair<Bitmap, Corners?>, FindPaperSheetContours.Params>()
-{
+class FindPaperSheetContours : UseCase<Pair<Bitmap, Corners?>, FindPaperSheetContours.Params>() {
     class Params(
         val bitmap: Bitmap,
         val returnOriginalMat: Boolean = false
@@ -93,4 +89,4 @@ class FindPaperSheetContours : UseCase<Pair<Bitmap, Corners?>, FindPaperSheetCon
         } catch (throwable: Throwable) {
             Left(Failure(throwable))
         }
-}
+}

app/src/main/java/net/kuama/documentscanner/domain/PerspectiveTransform.kt

@@ -1,6 +1,5 @@
 package net.kuama.documentscanner.domain
 
-import android.content.res.Resources
 import android.graphics.Bitmap
 import net.kuama.documentscanner.support.Either
 import net.kuama.documentscanner.support.Left
@@ -106,4 +105,4 @@ private fun sortPoints(src: Array<Point>): Array<Point> {
     result[3] = Collections.max(srcPoints, diffComparator)
 
     return result.filterNotNull().toTypedArray()
-}
+}

app/src/main/java/net/kuama/documentscanner/domain/UriToBitmap.kt

@@ -36,7 +36,7 @@ class UriToBitmap : UseCase<Bitmap, UriToBitmap.Params>() {
 
         val rotatedBitmap =
             Bitmap.createBitmap(image, 0, 0, image.width, image.height, matrix, true)
-        
+
         Right(rotatedBitmap)
     } catch (throwable: Throwable) {
         Left(Failure(throwable))

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

@@ -5,18 +5,15 @@ import android.graphics.Bitmap
 import android.os.Bundle
 import android.util.Log
 import android.view.View
-import android.widget.SeekBar
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.drawToBitmap
 import androidx.lifecycle.Observer
 import kotlinx.android.synthetic.main.activity_scanner.*
 import net.kuama.documentscanner.R
 import net.kuama.documentscanner.data.Loader
 import net.kuama.documentscanner.domain.Failure
 import net.kuama.documentscanner.domain.PerspectiveTransform
 import java.io.File
-import kotlin.system.exitProcess
 
 @androidx.camera.core.ExperimentalGetImage
 abstract class BaseScannerActivity : AppCompatActivity() {

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

@@ -4,25 +4,18 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Canvas
-import android.graphics.Matrix
 import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.view.ViewTreeObserver
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.net.toUri
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import kotlinx.android.synthetic.main.activity_cropper.*
 import net.kuama.documentscanner.R
-import net.kuama.documentscanner.domain.Failure
-import net.kuama.documentscanner.domain.FindPaperSheetContours
-import net.kuama.documentscanner.domain.PerspectiveTransform
-import net.kuama.documentscanner.domain.UriToBitmap
-import net.kuama.scanner.data.Corners
 
-class CropperActivity: AppCompatActivity() {
+class CropperActivity : AppCompatActivity() {
     private lateinit var cropModel: CropperModel
     private lateinit var bitmapUri: Uri
 
@@ -54,7 +47,7 @@ class CropperActivity: AppCompatActivity() {
 
             // Wait for bitmap to be loaded on view, then draw corners
             cropWrap.waitForLayout {
-                cropHud.onCorners(corners = cropModel.corners.value ?: error("invalic Corners"), height = cropPreview.measuredHeight, width =  cropPreview.measuredWidth)
+                cropHud.onCorners(corners = cropModel.corners.value ?: error("invalic Corners"), height = cropPreview.measuredHeight, width = cropPreview.measuredWidth)
             }
         })
 
@@ -118,7 +111,6 @@ class CropperActivity: AppCompatActivity() {
         v.draw(c)
         return b
     }
-
 }
 
 private inline fun View.waitForLayout(crossinline yourAction: () -> Unit) {
@@ -135,4 +127,3 @@ private inline fun View.waitForLayout(crossinline yourAction: () -> Unit) {
         }
     })
 }
-

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

@@ -11,7 +11,7 @@ import net.kuama.documentscanner.domain.PerspectiveTransform
 import net.kuama.documentscanner.domain.UriToBitmap
 import net.kuama.scanner.data.Corners
 
-class CropperModel: ViewModel() {
+class CropperModel : ViewModel() {
     private val perspectiveTransform: PerspectiveTransform = PerspectiveTransform()
     private val findPaperSheetUseCase: FindPaperSheetContours = FindPaperSheetContours()
     private val uriToBitmap: UriToBitmap = UriToBitmap()
@@ -76,4 +76,4 @@ class CropperModel: ViewModel() {
     }
 
     private fun handleFailure(failure: Failure) { }
-}
+}

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

@@ -123,7 +123,7 @@ class PaperRectangle : View {
         canvas?.drawPath(path, fillPaint)
         canvas?.drawPath(path, rectPaint)
 
-        if(cropMode) {
+        if (cropMode) {
             canvas?.drawCircle(tl.x.toFloat(), tl.y.toFloat(), 40F, extCirclePaint)
             canvas?.drawCircle(tr.x.toFloat(), tr.y.toFloat(), 40F, extCirclePaint)
             canvas?.drawCircle(bl.x.toFloat(), bl.y.toFloat(), 40F, extCirclePaint)
@@ -134,7 +134,6 @@ class PaperRectangle : View {
             canvas?.drawCircle(bl.x.toFloat(), bl.y.toFloat(), 35F, intCirclePaint)
             canvas?.drawCircle(br.x.toFloat(), br.y.toFloat(), 35F, intCirclePaint)
         }
-
     }
 
     fun onTouch(event: MotionEvent?): Boolean {

build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.3.72"
+    ext.kotlin_version = "1.4.31"
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.0.1"
+        classpath "com.android.tools.build:gradle:4.0.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.diffplug.spotless:spotless-plugin-gradle:5.1.0"
+        classpath "com.diffplug.spotless:spotless-plugin-gradle:5.9.0"
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip

settings.gradle

@@ -1,2 +1,3 @@
 include ":app"
+//include ":testapp"
 rootProject.name = "DocumentScanner"