Fixes #206 - Fix a bug where isEmpty always returns true

warting · Jan 25, 2023 · 77a445c · 77a445c
1 parent 2f4c010
commit 77a445c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/app/src/main/java/se/warting/signaturepad/ViewActivity.kt b/app/src/main/java/se/warting/signaturepad/ViewActivity.kt
@@ -29,17 +29,17 @@ class ViewActivity : Activity() {
 
  override fun onSigned() {
  Log.d("SignedListener", "OnSigned")
- mSaveButton.isEnabled = true
- mClearButton.isEnabled = true
+ mSaveButton.isEnabled = !mSignaturePad.isEmpty
+ mClearButton.isEnabled = !mSignaturePad.isEmpty
  }
 
  override fun onClear() {
 
  Toast.makeText(this@ViewActivity, "OnClear", Toast.LENGTH_SHORT)
  .show()
 
- mSaveButton.isEnabled = false
- mClearButton.isEnabled = false
+ mSaveButton.isEnabled = !mSignaturePad.isEmpty
+ mClearButton.isEnabled = !mSignaturePad.isEmpty
  }
  })
  mClearButton.setOnClickListener { mSignaturePad.clear() }

diff --git a/signature-view/src/main/java/se/warting/signatureview/views/SignaturePad.kt b/signature-view/src/main/java/se/warting/signatureview/views/SignaturePad.kt
@@ -38,7 +38,6 @@ class SignaturePad(context: Context, attrs: AttributeSet?) : View(context, attrs
 
  // View state
  private val points = mutableListOf<TimedPoint>()
- private var _isEmpty = false
 
  private var mLastTouchX = 0f
  private var mLastTouchY = 0f
@@ -171,7 +170,7 @@ class SignaturePad(context: Context, attrs: AttributeSet?) : View(context, attrs
  mLastWidth = (mMinWidth + mMaxWidth) / 2f
  mLastWidth = ((mMinWidth + mMaxWidth) / 2).toFloat()
  mSignatureTransparentBitmap = null
- makeEmpty(true)
+ notifyListeners()
  invalidate()
  }
 
@@ -281,11 +280,10 @@ class SignaturePad(context: Context, attrs: AttributeSet?) : View(context, attrs
  }
 
  val isEmpty: Boolean
- get() = _isEmpty
+ get() = points.isEmpty()
 
- private fun makeEmpty(newValue: Boolean) {
- _isEmpty = newValue
- if (_isEmpty) {
+ private fun notifyListeners() {
+ if (points.isEmpty()) {
  mSignedListener?.onClear()
  } else {
  mSignedListener?.onSigned()