From ebd0640bea8d2daea6dc3405728675c5a7b716c3 Mon Sep 17 00:00:00 2001 From: Saran Date: Wed, 5 Jun 2019 20:49:54 +0530 Subject: [PATCH 1/3] Made two types non null to one time non null check and execute within it --- .../com/github/saran2020/app/MainActivity.kt | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/github/saran2020/app/MainActivity.kt b/app/src/main/java/com/github/saran2020/app/MainActivity.kt index 82a8157..1a89fb4 100644 --- a/app/src/main/java/com/github/saran2020/app/MainActivity.kt +++ b/app/src/main/java/com/github/saran2020/app/MainActivity.kt @@ -30,17 +30,19 @@ class MainActivity : AppCompatActivity() { ratingViewHeart = findViewById(R.id.slide_rating_heart) ratingTextViewHeart = findViewById(R.id.rating_text_heart) - ratingViewHeart?.setDrawableResourceAssetMap( - mapOf( - 0f to R.drawable.ic_empty_filled_heart, - 0.5f to R.drawable.ic_half_filled_heart, - 1f to R.drawable.ic_filled_heart + ratingViewHeart?.apply { + setDrawableResourceAssetMap( + mapOf( + 0f to R.drawable.ic_empty_filled_heart, + 0.5f to R.drawable.ic_half_filled_heart, + 1f to R.drawable.ic_filled_heart + ) ) - ) - ratingViewHeart?.callback = object : DragRatingView.RatingChangeCallback { - override fun onRatingChanged(previous: Float, current: Float) { - ratingTextViewHeart?.text = "$current" + callback = object : DragRatingView.RatingChangeCallback { + override fun onRatingChanged(previous: Float, current: Float) { + ratingTextViewHeart?.text = "$current" + } } } } From f6433639f068c25214678e5e3212bf8c53dfe823 Mon Sep 17 00:00:00 2001 From: Saran Date: Wed, 5 Jun 2019 20:50:54 +0530 Subject: [PATCH 2/3] Change the callback method name from onRatingChanged() to onRatingChange() --- app/src/main/java/com/github/saran2020/app/MainActivity.kt | 4 ++-- .../java/com/github/saran2020/dragrating/DragRatingView.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/github/saran2020/app/MainActivity.kt b/app/src/main/java/com/github/saran2020/app/MainActivity.kt index 1a89fb4..d5a3b1d 100644 --- a/app/src/main/java/com/github/saran2020/app/MainActivity.kt +++ b/app/src/main/java/com/github/saran2020/app/MainActivity.kt @@ -22,7 +22,7 @@ class MainActivity : AppCompatActivity() { ratingTextView = findViewById(R.id.rating_text) ratingView?.callback = object : DragRatingView.RatingChangeCallback { - override fun onRatingChanged(previous: Float, current: Float) { + override fun onRatingChange(previous: Float, current: Float) { ratingTextView?.text = "$current" } } @@ -40,7 +40,7 @@ class MainActivity : AppCompatActivity() { ) callback = object : DragRatingView.RatingChangeCallback { - override fun onRatingChanged(previous: Float, current: Float) { + override fun onRatingChange(previous: Float, current: Float) { ratingTextViewHeart?.text = "$current" } } diff --git a/dragrating/src/main/java/com/github/saran2020/dragrating/DragRatingView.kt b/dragrating/src/main/java/com/github/saran2020/dragrating/DragRatingView.kt index 1a24120..de51043 100644 --- a/dragrating/src/main/java/com/github/saran2020/dragrating/DragRatingView.kt +++ b/dragrating/src/main/java/com/github/saran2020/dragrating/DragRatingView.kt @@ -40,7 +40,7 @@ open class DragRatingView @JvmOverloads constructor( } field = newRating - callback?.onRatingChanged(previousRating, field) + callback?.onRatingChange(previousRating, field) Log.d("buggy_bug", "current rating $currentRating") refreshRatingView() @@ -283,6 +283,6 @@ open class DragRatingView @JvmOverloads constructor( } interface RatingChangeCallback { - fun onRatingChanged(previous: Float, current: Float) + fun onRatingChange(previous: Float, current: Float) } } \ No newline at end of file From 42d4bf567f6fc3ebecfe1ee791eb2daa0d5a5a6c Mon Sep 17 00:00:00 2001 From: Saran Date: Wed, 5 Jun 2019 20:52:15 +0530 Subject: [PATCH 3/3] Apply the new change in the callback method name in Readme.md file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 358fbea..6d3e4d4 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ ratingView.setDrawableAssetMap( Callback when user is dragging the `DragRatingView` ```kotlin ratingView.callback = object : DragRatingView.RatingChangeCallback { - override fun onRatingChanged(previous: Float, new: Float) { + override fun onRatingChange(previous: Float, new: Float) { Log.d(TAG, "previous rating = $previous new rating = $current") } }