fix: increase color picker action button size

This commit is contained in:
7015725
2026-05-22 03:50:00 +08:00
parent ad58737c67
commit cc23da6904
3 changed files with 13 additions and 13 deletions

View File

@@ -5810,21 +5810,21 @@ FloatBallAppWM.prototype.showColorPickerPopup = function(opts) {
try { b.setIncludeFontPadding(false); } catch(eFontPad) {} try { b.setIncludeFontPadding(false); } catch(eFontPad) {}
if (primary) { if (primary) {
// 与设置页底部“保存布置”一致主色胶囊、44dp 高、轻描边。 // 与设置页底部“保存布置”一致主色胶囊、44dp 高、轻描边。
b.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 14); b.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 15);
// 颜色面板里不用高饱和青色,改成更沉稳的深绿主按钮。 // 颜色面板里不用高饱和青色,改成更沉稳的深绿主按钮。
b.setTextColor(android.graphics.Color.WHITE); b.setTextColor(android.graphics.Color.WHITE);
b.setPadding(self.dp(18), 0, self.dp(18), 0); b.setPadding(self.dp(18), 0, self.dp(18), 0);
try { b.setMinHeight(self.dp(44)); } catch(eMinH1) {} try { b.setMinHeight(self.dp(52)); } catch(eMinH1) {}
try { b.setBackground(self.ui.createStrokeDrawable(T.primaryDeep, self.withAlpha(T.brown || T.primaryDeep, isDark ? 0.28 : 0.18), self.dp(1), self.dp(22))); } catch(eBg1) {} try { b.setBackground(self.ui.createStrokeDrawable(T.primaryDeep, self.withAlpha(T.brown || T.primaryDeep, isDark ? 0.28 : 0.18), self.dp(1), self.dp(26))); } catch(eBg1) {}
try { b.setElevation(self.dp(1)); } catch(eElev) {} try { b.setElevation(self.dp(1)); } catch(eElev) {}
} else { } else {
// 与设置页按钮一致:次级也用大圆角按钮,不再做小 chip。 // 与设置页按钮一致:次级也用大圆角按钮,不再做小 chip。
b.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 14); b.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 15);
// 次级按钮走设置页里的奶油/描边感,不再用薄荷绿底。 // 次级按钮走设置页里的奶油/描边感,不再用薄荷绿底。
b.setTextColor(T.brown || T.sub); b.setTextColor(T.brown || T.sub);
b.setPadding(self.dp(16), 0, self.dp(16), 0); b.setPadding(self.dp(16), 0, self.dp(16), 0);
try { b.setMinHeight(self.dp(44)); } catch(eMinH2) {} try { b.setMinHeight(self.dp(52)); } catch(eMinH2) {}
try { b.setBackground(self.ui.createStrokeDrawable(T.card2 || T.card, self.withAlpha(T.stroke || T.brown, isDark ? 0.42 : 0.55), self.dp(1), self.dp(22))); } catch(eBg2) {} try { b.setBackground(self.ui.createStrokeDrawable(T.card2 || T.card, self.withAlpha(T.stroke || T.brown, isDark ? 0.42 : 0.55), self.dp(1), self.dp(26))); } catch(eBg2) {}
try { b.setElevation(self.dp(1)); } catch(eElev2) {} try { b.setElevation(self.dp(1)); } catch(eElev2) {}
} }
try { b.setClickable(true); b.setFocusable(true); } catch(eClickable) {} try { b.setClickable(true); b.setFocusable(true); } catch(eClickable) {}
@@ -5840,7 +5840,7 @@ FloatBallAppWM.prototype.showColorPickerPopup = function(opts) {
var actionRow = new android.widget.LinearLayout(context); var actionRow = new android.widget.LinearLayout(context);
actionRow.setOrientation(android.widget.LinearLayout.HORIZONTAL); actionRow.setOrientation(android.widget.LinearLayout.HORIZONTAL);
actionRow.setGravity(android.view.Gravity.CENTER_VERTICAL); actionRow.setGravity(android.view.Gravity.CENTER_VERTICAL);
actionRow.setPadding(self.dp(12), self.dp(8), self.dp(12), self.dp(10)); actionRow.setPadding(self.dp(10), self.dp(10), self.dp(10), self.dp(12));
var btnClear = createColorPanelActionButton("恢复默认", false, function() { var btnClear = createColorPanelActionButton("恢复默认", false, function() {
isFollowTheme = true; isFollowTheme = true;
@@ -5854,7 +5854,7 @@ FloatBallAppWM.prototype.showColorPickerPopup = function(opts) {
alphaValTv.setText("255"); alphaValTv.setText("255");
currentAlphaByte = 255; currentAlphaByte = 255;
}); });
var clearLp = new android.widget.LinearLayout.LayoutParams(0, self.dp(44)); var clearLp = new android.widget.LinearLayout.LayoutParams(0, self.dp(52));
clearLp.weight = 1; clearLp.weight = 1;
clearLp.setMargins(0, 0, self.dp(6), 0); clearLp.setMargins(0, 0, self.dp(6), 0);
actionRow.addView(btnClear, clearLp); actionRow.addView(btnClear, clearLp);
@@ -5875,7 +5875,7 @@ FloatBallAppWM.prototype.showColorPickerPopup = function(opts) {
} }
closePopup(); closePopup();
}); });
var okLp = new android.widget.LinearLayout.LayoutParams(0, self.dp(44)); var okLp = new android.widget.LinearLayout.LayoutParams(0, self.dp(52));
okLp.weight = 1; okLp.weight = 1;
okLp.setMargins(self.dp(6), 0, 0, 0); okLp.setMargins(self.dp(6), 0, 0, 0);
actionRow.addView(btnOk, okLp); actionRow.addView(btnOk, okLp);

View File

@@ -54,8 +54,8 @@
"size": 21198 "size": 21198
}, },
"th_14_panels.js": { "th_14_panels.js": {
"sha256": "ccfedd74d601187d0d47b03f6140a0fcae20dc49d503c3c923062f50fa1c1efb", "sha256": "e71b13ecaa8c33bf4742b2a9d8201b0d3556b797c693721688f0dc51be5e22c7",
"size": 292861 "size": 292862
}, },
"th_15_extra.js": { "th_15_extra.js": {
"sha256": "11a9866ba156c2a7862633530eb0d796a9955698a0c3fad4199dcccd4bb27c47", "sha256": "11a9866ba156c2a7862633530eb0d796a9955698a0c3fad4199dcccd4bb27c47",
@@ -68,5 +68,5 @@
}, },
"keyId": "toolhub-targets-2026-rsa3072", "keyId": "toolhub-targets-2026-rsa3072",
"schema": 2, "schema": 2,
"version": 20260521194735 "version": 20260521194955
} }

View File

@@ -1 +1 @@
Q/28vC4oUJ4j/Z97cJmt+EQ2RzXIxjAwYo6aHBfuWMZ0Q/ZWt0yPPMoh0MKkvqJCVeLKMbGJ+wVuTwtXclURGWy0S8AYAGw41lQcnmFukGXFCwdTmDwm35+mmIng5W/OHNfrrOEN1U4HSpwHZDpREpS8OANcMGZDh7JJmPwZOZi6LP0rmuy2MNuGTeDjljx7SaWff+8BzMgsGy2ad+iNupsF92s7hIcSQrT2Tf5ozLp2Z0qF7ve/4ZaKj4y9rtSgcov2dlimH+IC9HsC2drO04H0ws16QYcOO2o6UxbWtQyg131UYVUIZcGJyC6dTO71h3yLBOJ/YZ527JXWdhofTOn6dmk5wxjZimx02ajwswxfC0Qyg60aSLJ5rZeyYDPJlCZb05yo6cyNBlp9+fTG0GbjXGj4Kxq9orLHyqgiegsuIkNoNwe10G51iUy/GDRUmznn1SeNXpGhfiUGoqukhOA1xcGy/ndetuscpQmM2PKSu0mq3vuBhwxysvL37q1m NP16btZ+A8rAqr9KVGhL04QXPaDNxjQ3RyBOsoweawP4JpyD81Zt+JpgffpK87PqyaVEfYHRl883F6axGHpYgAVHSl49R0wTLnwaWuFddsIjKZtnThZJD7138glSGIFrYZ3HjiYmshJerfVe434crIQKTeFCd7hPr42MTuhQWtl30MQS4zXaKV7F8S0agJzVJUHR9zQdSBgdjS0luHrSTurIPmq4xy3j/CVzfgtw3103jm+meX+AYvIaANm26GYS0ye2W78zvEzGBwNgMRDQvkg/LcrDRLz2d5O4kVPviAd/2fWvqKet9WCnWx8VrZGcDtNS3ru2Z/aGnVnk2XLz9OFOWofdWOhoTcDrH7Fa8Ox8r9eIBZZIiRJL45ml7PustLP3kOI/hhX0eNXbr32On3+Y2lbHQw4mmA/RFHV7sVHbkaD8iDRYONXxYoF8h2qBVCyTmti5qe36H3gtOCTBgOXa9SpEc8Uj2S79eQvxatQc33LS++0RSNrEoCAcuR3r