From c3837adb19434e0fbab0d00d82c29641abc674ab Mon Sep 17 00:00:00 2001 From: Neo Fu Date: Wed, 25 Oct 2023 20:02:12 +0800 Subject: [PATCH] + int getColor(int progress) --- .../colorseekbardemo/fragment/ColorSeekBarFragment.kt | 5 +---- .../com/rtugeek/android/colorseekbar/ColorSeekBar.java | 10 ++++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/rtugeek/android/colorseekbardemo/fragment/ColorSeekBarFragment.kt b/app/src/main/java/com/rtugeek/android/colorseekbardemo/fragment/ColorSeekBarFragment.kt index b33b71d..b9a5e26 100644 --- a/app/src/main/java/com/rtugeek/android/colorseekbardemo/fragment/ColorSeekBarFragment.kt +++ b/app/src/main/java/com/rtugeek/android/colorseekbardemo/fragment/ColorSeekBarFragment.kt @@ -2,19 +2,17 @@ package com.rtugeek.android.colorseekbardemo.fragment import android.graphics.Color import android.os.Bundle +import android.os.Handler import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.SeekBar import androidx.fragment.app.Fragment -import androidx.lifecycle.lifecycleScope import com.rtugeek.android.colorseekbar.thumb.DefaultThumbDrawer import com.rtugeek.android.colorseekbardemo.Utils import com.rtugeek.android.colorseekbardemo.databinding.FragmentColorSeekBarBinding import kotlinx.android.synthetic.main.fragment_color_seek_bar.* -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch /** * A placeholder fragment containing a simple view. @@ -62,7 +60,6 @@ class ColorSeekBarFragment : Fragment() { override fun onStopTrackingTouch(seekBar: SeekBar) {} }) - seek_thumb_size.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener { override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) { val thumbDrawer = DefaultThumbDrawer( diff --git a/colorseekbar/src/main/java/com/rtugeek/android/colorseekbar/ColorSeekBar.java b/colorseekbar/src/main/java/com/rtugeek/android/colorseekbar/ColorSeekBar.java index 1493e67..407d37e 100644 --- a/colorseekbar/src/main/java/com/rtugeek/android/colorseekbar/ColorSeekBar.java +++ b/colorseekbar/src/main/java/com/rtugeek/android/colorseekbar/ColorSeekBar.java @@ -11,11 +11,9 @@ import android.graphics.RectF; import android.graphics.Shader; import android.os.Build; -import android.os.Parcelable; import android.util.AttributeSet; import androidx.annotation.ArrayRes; -import androidx.annotation.Nullable; import com.rtugeek.android.colorseekbar.thumb.DefaultThumbDrawer; @@ -73,7 +71,6 @@ public ColorSeekBar(Context context, AttributeSet attrs, int defStyleAttr, int d applyStyle(context, attrs, defStyleAttr, defStyleRes); } - private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { mContext = context; //get attributes @@ -231,10 +228,11 @@ protected void onDraw(Canvas canvas) { } /** + * get color by progress value * @param progress - * @return color + * @return return Integer.MAX_VALUE if progress out of bounds */ - private int pickColor(int progress) { + public int getColor(int progress) { if (progress < 0) return Integer.MAX_VALUE; if (progress > maxProgress) return Integer.MAX_VALUE; if (progress >= getColors().size()) return Integer.MAX_VALUE; @@ -264,7 +262,7 @@ private int pickColorFromBitmap(Bitmap bitmap, float percent) { * @return */ public int getColor() { - return pickColor(progress); + return getColor(progress); }