mirror of
https://github.com/markusfisch/BinaryEye.git
synced 2024-09-20 12:02:17 +02:00
Show plus in FAB if flash is not available
So it doesn't look awkward when a device doesn't have a flash.
This commit is contained in:
parent
969ffd3d0a
commit
4cc4cef4ca
@ -10,6 +10,7 @@ import android.hardware.Camera
|
|||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.os.Vibrator
|
import android.os.Vibrator
|
||||||
|
import android.support.design.widget.FloatingActionButton
|
||||||
import android.support.v7.app.AppCompatActivity
|
import android.support.v7.app.AppCompatActivity
|
||||||
import android.support.v7.widget.Toolbar
|
import android.support.v7.widget.Toolbar
|
||||||
import android.support.v8.renderscript.RSRuntimeException
|
import android.support.v8.renderscript.RSRuntimeException
|
||||||
@ -54,7 +55,7 @@ class CameraActivity : AppCompatActivity() {
|
|||||||
private lateinit var cameraView: CameraView
|
private lateinit var cameraView: CameraView
|
||||||
private lateinit var detectorView: DetectorView
|
private lateinit var detectorView: DetectorView
|
||||||
private lateinit var zoomBar: SeekBar
|
private lateinit var zoomBar: SeekBar
|
||||||
private lateinit var flashFab: View
|
private lateinit var flashFab: FloatingActionButton
|
||||||
|
|
||||||
private var preprocessor: Preprocessor? = null
|
private var preprocessor: Preprocessor? = null
|
||||||
private var nativeMapping: Mapping? = null
|
private var nativeMapping: Mapping? = null
|
||||||
@ -111,8 +112,7 @@ class CameraActivity : AppCompatActivity() {
|
|||||||
cameraView = findViewById(R.id.camera_view) as CameraView
|
cameraView = findViewById(R.id.camera_view) as CameraView
|
||||||
detectorView = findViewById(R.id.detector_view) as DetectorView
|
detectorView = findViewById(R.id.detector_view) as DetectorView
|
||||||
zoomBar = findViewById(R.id.zoom) as SeekBar
|
zoomBar = findViewById(R.id.zoom) as SeekBar
|
||||||
flashFab = findViewById(R.id.flash)
|
flashFab = findViewById(R.id.flash) as FloatingActionButton
|
||||||
flashFab.setOnClickListener { toggleTorchMode() }
|
|
||||||
|
|
||||||
initCameraView()
|
initCameraView()
|
||||||
initZoomBar()
|
initZoomBar()
|
||||||
@ -195,7 +195,7 @@ class CameraActivity : AppCompatActivity() {
|
|||||||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||||
return when (item.itemId) {
|
return when (item.itemId) {
|
||||||
R.id.create -> {
|
R.id.create -> {
|
||||||
startActivity(MainActivity.getEncodeIntent(this))
|
createBarcode()
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
R.id.history -> {
|
R.id.history -> {
|
||||||
@ -230,6 +230,10 @@ class CameraActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun createBarcode() {
|
||||||
|
startActivity(MainActivity.getEncodeIntent(this))
|
||||||
|
}
|
||||||
|
|
||||||
private fun switchCamera() {
|
private fun switchCamera() {
|
||||||
closeCamera()
|
closeCamera()
|
||||||
frontFacing = frontFacing xor true
|
frontFacing = frontFacing xor true
|
||||||
@ -414,11 +418,13 @@ class CameraActivity : AppCompatActivity() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun updateFlashFab(available: Boolean) {
|
private fun updateFlashFab(unavailable: Boolean) {
|
||||||
flashFab.visibility = if (available) {
|
if (unavailable) {
|
||||||
View.GONE
|
flashFab.setImageResource(R.drawable.ic_action_create)
|
||||||
|
flashFab.setOnClickListener { createBarcode() }
|
||||||
} else {
|
} else {
|
||||||
View.VISIBLE
|
flashFab.setImageResource(R.drawable.ic_action_flash)
|
||||||
|
flashFab.setOnClickListener { toggleTorchMode() }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user