linshenjianlu/ShortX_ToolHub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: refine color picker action sizing

Browse Source
This commit is contained in:
7015725
2026-05-22 03:32:05 +08:00
parent 2cd1fdd660
commit 04818a909e
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/th_14_panels.js
View File

@@ -5806,17 +5806,17 @@ FloatBallAppWM.prototype.showColorPickerPopup = function(opts) {
b.setText(label); b.setText(label);
b.setGravity(android.view.Gravity.CENTER); b.setGravity(android.view.Gravity.CENTER);
b.setSingleLine(true); b.setSingleLine(true);
b.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 14); b.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 13);
b.setTypeface(null, android.graphics.Typeface.BOLD); b.setTypeface(null, android.graphics.Typeface.BOLD);
b.setPadding(self.dp(12), 0, self.dp(12), 0); b.setPadding(self.dp(10), 0, self.dp(10), 0);
try { b.setIncludeFontPadding(false); } catch(eFontPad) {} try { b.setIncludeFontPadding(false); } catch(eFontPad) {}
try { b.setMinHeight(self.dp(46)); } catch(eMinH) {} try { b.setMinHeight(self.dp(40)); } catch(eMinH) {}
if (primary) { if (primary) {
b.setTextColor(T.onPrimary || android.graphics.Color.WHITE); b.setTextColor(T.onPrimary || android.graphics.Color.WHITE);
try { b.setBackground(self.ui.createStrokeDrawable(T.primary, self.withAlpha(T.primaryDeep, isDark ? 0.38 : 0.20), self.dp(1), self.dp(23))); } catch(eBg1) {} try { b.setBackground(self.ui.createStrokeDrawable(T.primary, self.withAlpha(T.primaryDeep, isDark ? 0.34 : 0.18), self.dp(1), self.dp(20))); } catch(eBg1) {}
} else { } else {
b.setTextColor(T.primaryDeep); b.setTextColor(T.primaryDeep);
try { b.setBackground(self.ui.createStrokeDrawable(T.primarySoft, self.withAlpha(T.primaryDeep, isDark ? 0.34 : 0.24), self.dp(1), self.dp(23))); } catch(eBg2) {} try { b.setBackground(self.ui.createStrokeDrawable(T.card2 || T.primarySoft, self.withAlpha(T.primaryDeep, isDark ? 0.30 : 0.22), self.dp(1), self.dp(20))); } catch(eBg2) {}
} }
try { b.setClickable(true); b.setFocusable(true); } catch(eClickable) {} try { b.setClickable(true); b.setFocusable(true); } catch(eClickable) {}
b.setOnClickListener(new android.view.View.OnClickListener({ b.setOnClickListener(new android.view.View.OnClickListener({
@@ -5831,7 +5831,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(12), self.dp(6), self.dp(12), self.dp(8));
var btnClear = createColorPanelActionButton("恢复默认", false, function() { var btnClear = createColorPanelActionButton("恢复默认", false, function() {
isFollowTheme = true; isFollowTheme = true;
@@ -5845,9 +5845,8 @@ 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(46)); var clearLp = new android.widget.LinearLayout.LayoutParams(self.dp(108), self.dp(40));
clearLp.weight = 1; clearLp.setMargins(0, 0, self.dp(8), 0);
clearLp.setMargins(0, 0, self.dp(6), 0);
actionRow.addView(btnClear, clearLp); actionRow.addView(btnClear, clearLp);
var btnOk = createColorPanelActionButton("保存颜色", true, function() { var btnOk = createColorPanelActionButton("保存颜色", true, function() {
@@ -5866,9 +5865,9 @@ FloatBallAppWM.prototype.showColorPickerPopup = function(opts) {
} }
closePopup(); closePopup();
}); });
var okLp = new android.widget.LinearLayout.LayoutParams(0, self.dp(46)); var okLp = new android.widget.LinearLayout.LayoutParams(0, self.dp(40));
okLp.weight = 1; okLp.weight = 1;
okLp.setMargins(self.dp(6), 0, 0, 0); okLp.setMargins(self.dp(4), 0, 0, 0);
actionRow.addView(btnOk, okLp); actionRow.addView(btnOk, okLp);
content.addView(actionRow, new android.widget.LinearLayout.LayoutParams( content.addView(actionRow, new android.widget.LinearLayout.LayoutParams(

6
manifest.json
View File

@@ -54,8 +54,8 @@
"size": 21198 "size": 21198
}, },
"th_14_panels.js": { "th_14_panels.js": {
"sha256": "74292e7fba694962e009b516111714d2b4be46c5784504efbfee6e9f5624cb14", "sha256": "be6b4895b2ef8cce6b9a6ace1af2c0c1f47683588e7b3234c4dbd3e2fa10a3af",
"size": 292190 "size": 292185
}, },
"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": 20260521193003 "version": 20260521193201
} }

2
manifest.sig
View File

@@ -1 +1 @@
PXxCENnwPa9E439nekyIgwoQ+81vCMYSXagiCxpmN9KlpFOpFrtbB4NYX+COQvv/QeKZb8nlhxIpxVkCSub+7C7Qgzt6rEeWCOKz6FOjhNrGzTXwtO9wFGq+GnjPBhULRZXOwmEZtUnRfchF0nADfydtBGCnBZ69dqMBkS6MsMNTQltQsPnpCDF3RKqud1XxgA4lntVsCthVjnyRjZ73lS3UdUpaJiFho+H3ijn9HxgmNqYDDPhAEYJhhJlDQWHKL+WH3N5mkkQa0Kx1BSHkmurakt6qVnaxEb7fxVxv7sH6R1hHqFTDQ/JywRzMX49wDYtTrqdiriy77czwaJ6geO2/x1N/zJ1ifhDWgzubqXEiPCayusetkG7UR+c9CUXt1/ACeYcR2psA6SBw4gQ9Y7JwC0aUBwAyz//RUV8Rwfrk3z4KC3xq+9ObZg7TqF6kwKNf3z8rX/d1v05Hca5laSXjsfS4Qeb062thq4Dksd5ELz2C2uH+RjNuIDx41e5I hYwqO8x1rU41dskwn/9IPbFHKZ/CC++fHjG+mMVxWDza6wbU/EVaYdJFIRVgV/wBFUX1i0flpYRksgZFNOXQ3e3HUfDYBEw+Y1B/vYpAzZhSjssR7q3vzT3SWq83FMIe4yKd3b8B2nmwQqaxooaM+w/PvhlCL5pOkuqihqU53wgoZFWGxZxGiCHoFCS+ly0B90uxY8Uzb8Ryybyq5ffvL+rl75Z/2QF7lm5JF4uiHxhQu2+L+LTJM+olmi8b5zZgVo4125EIYnw/qQNSqex2z2wuZgQyecWTJsD0nxGN8J7blOnPoIPBc8QKyBg6LUWh1i81Fc6MGi34a8S1kr8CgQyf0Xz1RV7zdEDyY7+OxBe9ALtoCJ/a6mSbZSObcr1yTywY1iqQY6VtWzpxkCon/n7YGfloKv5JlhEM+60/01jvbO4kpR0hoGLfs/9ARKPFpuyS7sr8X3igXvywcQnt9H7zBcwn/PcR0BgP8EjjpWSr6FyYfx1z3sbH36GfVoXy