PR changes

- add description on long-press
- remove lazy initialization
- correct icon name typo, rename to ic_colorize_off_vector
This commit is contained in:
Paul Akhamiogu 2021-12-28 18:38:11 +00:00
parent eee85ec337
commit 3e01e3be97
2 changed files with 13 additions and 9 deletions

View File

@ -50,10 +50,12 @@ class MainActivity : SimpleActivity(), CanvasListener {
private val BITMAP_PATH = "bitmap_path" private val BITMAP_PATH = "bitmap_path"
private val URI_TO_LOAD = "uri_to_load" private val URI_TO_LOAD = "uri_to_load"
private lateinit var eyeDropper : EyeDropper
private var defaultPath = "" private var defaultPath = ""
private var defaultFilename = "" private var defaultFilename = ""
private var defaultExtension = PNG
private var defaultExtension = PNG
private var intentUri: Uri? = null private var intentUri: Uri? = null
private var uriToLoad: Uri? = null private var uriToLoad: Uri? = null
private var color = 0 private var color = 0
@ -66,16 +68,15 @@ class MainActivity : SimpleActivity(), CanvasListener {
private var isEditIntent = false private var isEditIntent = false
private var lastBitmapPath = "" private var lastBitmapPath = ""
private val eyeDropper by lazy {
EyeDropper(my_canvas) { selectedColor ->
setColor(selectedColor)
}
}
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main) setContentView(R.layout.activity_main)
appLaunched(BuildConfig.APPLICATION_ID) appLaunched(BuildConfig.APPLICATION_ID)
eyeDropper = EyeDropper(my_canvas) { selectedColor ->
setColor(selectedColor)
}
my_canvas.mListener = this my_canvas.mListener = this
stroke_width_bar.setOnSeekBarChangeListener(onStrokeWidthBarChangeListener) stroke_width_bar.setOnSeekBarChangeListener(onStrokeWidthBarChangeListener)
@ -97,7 +98,10 @@ class MainActivity : SimpleActivity(), CanvasListener {
} }
redo.setOnClickListener { my_canvas.redo() } redo.setOnClickListener { my_canvas.redo() }
eye_dropper.setOnClickListener { eyeDropperClicked() } eye_dropper.setOnClickListener { eyeDropperClicked() }
eye_dropper.setOnLongClickListener {
toast(R.string.eyedropper)
true
}
checkIntents() checkIntents()
if (!isImageCaptureIntent) { if (!isImageCaptureIntent) {
checkWhatsNewDialog() checkWhatsNewDialog()
@ -352,7 +356,7 @@ class MainActivity : SimpleActivity(), CanvasListener {
} else { } else {
eyeDropper.stop() eyeDropper.stop()
} }
eye_dropper.setImageDrawable(ContextCompat.getDrawable(this, if (isEyeDropperOn) R.drawable.ic_colorise_off_vector else R.drawable.ic_colorize_vector)) eye_dropper.setImageDrawable(ContextCompat.getDrawable(this, if (isEyeDropperOn) R.drawable.ic_colorize_off_vector else R.drawable.ic_colorize_vector))
} }
private fun confirmImage() { private fun confirmImage() {