diff --git a/powerbell/build.properties b/powerbell/build.properties index cff47d1..c5cf57e 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Dec 16 08:20:17 GMT 2025 +#Tue Dec 16 09:10:00 GMT 2025 stageCount=7 libraryProject= baseVersion=15.14 publishVersion=15.14.6 -buildCount=45 +buildCount=48 baseBetaVersion=15.14.7 diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java index d172d75..a2db7a3 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java @@ -32,6 +32,7 @@ import cc.winboll.studio.powerbell.utils.FileUtils; import cc.winboll.studio.powerbell.utils.ImageCropUtils; import cc.winboll.studio.powerbell.utils.UriUtils; import cc.winboll.studio.powerbell.views.BackgroundView; +import com.a4455jkjh.colorpicker.ColorPickerDialog; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/dialogs/ColorPaletteDialog.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/dialogs/ColorPaletteDialog.java index 71395bc..3b8284c 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/dialogs/ColorPaletteDialog.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/dialogs/ColorPaletteDialog.java @@ -20,7 +20,9 @@ import android.widget.LinearLayout; import android.widget.SeekBar; import android.widget.TextView; import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.ToastUtils; import cc.winboll.studio.powerbell.R; +import com.a4455jkjh.colorpicker.ColorPickerDialog; /** * @Author ZhanGSKen @@ -660,6 +662,9 @@ public class ColorPaletteDialog extends Dialog implements View.OnClickListener, if (!isAppSelfUpdatingColor) { if (id == R.id.iv_color_picker) { showSystemColorPicker(); // 打开系统颜色选择器 + } if (id == R.id.iv_color_scale) { + ToastUtils.show("iv_color_scale"); + openColorPickerDialog(mCurrentColor); // 打开系统颜色选择器 } else if (id == R.id.tv_confirm) { mListener.onColorSelected(mCurrentColor); // 确认选择,回调颜色 LogUtils.d(TAG, "confirm color | 回调颜色:" + String.format("#%08X", mCurrentColor)); @@ -674,5 +679,50 @@ public class ColorPaletteDialog extends Dialog implements View.OnClickListener, } } } + + + void openColorPickerDialog(int nColor){ + ToastUtils.show("openColorPickerDialog"); + ColorPickerDialog dlg = new ColorPickerDialog(getContext(), nColor); + dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() { + + @Override + public void beforeColorChanged() { + } + + @Override + public void onColorChanged(int color) { + if (!isAppSelfUpdatingColor) { + isAppSelfUpdatingColor = true; + try { + mOriginalAlpha = Color.alpha(color); + mOriginalAlphaPercent = alpha2Percent(mOriginalAlpha); + mOriginalR = Color.red(color); + mOriginalG = Color.green(color); + mOriginalB = Color.blue(color); + mCurrentAlpha = mOriginalAlpha; + mCurrentAlphaPercent = mOriginalAlphaPercent; + mCurrentR = mOriginalR; + mCurrentG = mOriginalG; + mCurrentB = mOriginalB; + mCurrentBrightnessPercent = DEFAULT_BRIGHTNESS; + mCurrentColor = color; + updateAllViews(); + LogUtils.d(TAG, "select system color | 选择颜色:" + String.format("#%08X", color) + + " | 透明度:" + mCurrentAlphaPercent + "%"); + } finally { + isAppSelfUpdatingColor = false; + } + } + } + + @Override + public void afterColorChanged() { + } + + + }); + dlg.show(); + } } diff --git a/powerbell/src/main/res/drawable/color_scale_logo.png b/powerbell/src/main/res/drawable/color_scale_logo.png new file mode 100644 index 0000000..70123fb Binary files /dev/null and b/powerbell/src/main/res/drawable/color_scale_logo.png differ diff --git a/powerbell/src/main/res/layout/dialog_color_palette.xml b/powerbell/src/main/res/layout/dialog_color_palette.xml index 426ce5c..d71ea4c 100644 --- a/powerbell/src/main/res/layout/dialog_color_palette.xml +++ b/powerbell/src/main/res/layout/dialog_color_palette.xml @@ -7,15 +7,29 @@ android:padding="20dp" android:background="#FFFFFFFF"> - + + + + + + +