Skip to content

Commit ca4c44c

Browse files
chore : update gitignore and remove unnecessary imports
1 parent 4be4ee5 commit ca4c44c

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
/build
99
/captures
1010
.externalNativeBuild
11+
google-services.json

app/src/main/java/io/github/the_dagger/mlkit/MainActivity.kt

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@ package io.github.the_dagger.mlkit
22

33
import android.graphics.Bitmap
44
import android.os.Bundle
5+
import android.support.design.widget.BottomSheetBehavior
56
import android.support.v7.app.AppCompatActivity
7+
import android.support.v7.widget.LinearLayoutManager
8+
import android.view.View
9+
import android.widget.Toast
610
import com.google.firebase.ml.vision.FirebaseVision
711
import com.google.firebase.ml.vision.common.FirebaseVisionImage
8-
import com.wonderkiln.camerakit.CameraKitImage
9-
import android.support.design.widget.BottomSheetBehavior
10-
import android.support.design.widget.Snackbar
11-
import android.support.v7.widget.LinearLayoutManager
1212
import kotlinx.android.synthetic.main.activity_main.*
1313
import kotlinx.android.synthetic.main.layout_bottom_sheet.*
14-
import android.view.View
15-
import android.widget.Toast
16-
import io.github.the_dagger.mlkit.R.id.*
1714

1815

1916
class MainActivity : AppCompatActivity() {
@@ -43,7 +40,8 @@ class MainActivity : AppCompatActivity() {
4340
fab_take_photo.setOnClickListener {
4441
fabProgressCircle.show()
4542
cameraView.captureImage { cameraKitImage ->
46-
getLabelsFromClod(captureImage(cameraKitImage))
43+
// Get the Bitmap from the captured shot
44+
getLabelsFromClod(cameraKitImage.bitmap)
4745
runOnUiThread {
4846
showPreview()
4947
imagePreview.setImageBitmap(cameraKitImage.bitmap)
@@ -63,7 +61,7 @@ class MainActivity : AppCompatActivity() {
6361
itemsList.addAll(it)
6462
itemAdapter = ItemAdapter(itemsList,false)
6563
rvLabel.adapter = itemAdapter
66-
sheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
64+
sheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED)
6765
}
6866
.addOnFailureListener {
6967
// Task failed with an exception
@@ -84,7 +82,7 @@ class MainActivity : AppCompatActivity() {
8482
itemsList.addAll(it)
8583
itemAdapter = ItemAdapter(itemsList,true)
8684
rvLabel.adapter = itemAdapter
87-
sheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
85+
sheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED)
8886
}
8987
.addOnFailureListener {
9088
// Task failed with an exception
@@ -113,8 +111,4 @@ class MainActivity : AppCompatActivity() {
113111
cameraView.visibility = View.VISIBLE
114112
}
115113

116-
private fun captureImage(cameraKitImage: CameraKitImage): Bitmap {
117-
return cameraKitImage.bitmap
118-
}
119-
120114
}

0 commit comments

Comments
 (0)