From 058020e7cc412a2a17dec30edb754be7e1415abd Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Mon, 30 Dec 2019 19:13:04 -0800 Subject: Update CircleView and changelog --- .../src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt | 4 ++-- docs/Changelog.md | 1 + .../main/kotlin/ca/allanwang/fastadapter/viewbinding/BindingItem.kt | 2 +- sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt | 4 ---- sample/src/main/kotlin/ca/allanwang/kau/sample/PermissionCheckbox.kt | 5 ++--- sample/src/main/res/xml/kau_changelog.xml | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt b/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt index 39fb1cf..27849bc 100644 --- a/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt +++ b/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt @@ -143,8 +143,8 @@ class CircleView @JvmOverloads constructor(context: Context, attrs: AttributeSet setMeasuredDimension(measuredWidth, measuredWidth) } - override fun onDraw(canvas: Canvas) { - super.onDraw(canvas) + override fun onDrawForeground(canvas: Canvas) { + super.onDrawForeground(canvas) val centerWidth = (measuredWidth / 2).toFloat() val centerHeight = (measuredHeight / 2).toFloat() if (withBorder) canvas.drawCircle(centerWidth, centerHeight, centerWidth, whitePaint) diff --git a/docs/Changelog.md b/docs/Changelog.md index 37e355e..9f45e87 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -2,6 +2,7 @@ ## v5.2.0 * :about: Migrate about libraries to v7.x.x +* :color: Draw CircleView in foreground instead of background * :core: Migrate iconics to v4.x.x * :core: Automatically switch light mode for navigationBarColor and statusBarColor * :core: Remove statusBarLight toggle diff --git a/fastadapter-viewbinding/src/main/kotlin/ca/allanwang/fastadapter/viewbinding/BindingItem.kt b/fastadapter-viewbinding/src/main/kotlin/ca/allanwang/fastadapter/viewbinding/BindingItem.kt index 543a9ef..96055e4 100644 --- a/fastadapter-viewbinding/src/main/kotlin/ca/allanwang/fastadapter/viewbinding/BindingItem.kt +++ b/fastadapter-viewbinding/src/main/kotlin/ca/allanwang/fastadapter/viewbinding/BindingItem.kt @@ -153,4 +153,4 @@ abstract class BindingClickEventHook, item: Item) -} \ No newline at end of file +} diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt index 50b3cf3..a472f09 100644 --- a/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt +++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt @@ -18,20 +18,16 @@ package ca.allanwang.kau.sample import android.os.Bundle import ca.allanwang.kau.adapters.SingleFastAdapter import ca.allanwang.kau.internal.KauBaseActivity -import ca.allanwang.kau.logging.KL import ca.allanwang.kau.permissions.PERMISSION_ACCESS_COARSE_LOCATION import ca.allanwang.kau.permissions.PERMISSION_ACCESS_FINE_LOCATION import ca.allanwang.kau.permissions.PERMISSION_CAMERA -import ca.allanwang.kau.permissions.kauRequestPermissions import ca.allanwang.kau.swipe.SWIPE_EDGE_LEFT import ca.allanwang.kau.swipe.kauSwipeOnCreate import ca.allanwang.kau.swipe.kauSwipeOnDestroy import ca.allanwang.kau.utils.fullLinearRecycler import ca.allanwang.kau.utils.startActivity -import ca.allanwang.kau.utils.toast import ca.allanwang.kau.utils.withAlpha import ca.allanwang.kau.utils.withSlideOut -import com.mikepenz.fastadapter.adapters.FastItemAdapter /** * Created by Allan Wang on 2017-06-12. diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/PermissionCheckbox.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/PermissionCheckbox.kt index 40ad663..50cfe69 100644 --- a/sample/src/main/kotlin/ca/allanwang/kau/sample/PermissionCheckbox.kt +++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/PermissionCheckbox.kt @@ -15,7 +15,6 @@ */ package ca.allanwang.kau.sample -import android.Manifest import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -98,7 +97,7 @@ class PermissionCheckboxViewBinding( item: PermissionCheckboxViewBinding ) { KL.d { "Perm Click" } - with (v.context) { + with(v.context) { kauRequestPermissions(item.data.permission) { granted, _ -> toast("${item.data.permission} enabled: $granted") fastAdapter.notifyAdapterDataSetChanged() @@ -107,4 +106,4 @@ class PermissionCheckboxViewBinding( } } } -} \ No newline at end of file +} diff --git a/sample/src/main/res/xml/kau_changelog.xml b/sample/src/main/res/xml/kau_changelog.xml index d8c167f..2907e43 100644 --- a/sample/src/main/res/xml/kau_changelog.xml +++ b/sample/src/main/res/xml/kau_changelog.xml @@ -8,13 +8,13 @@ + - -- cgit v1.2.3