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

Revert "feat: split button editor into app subpages"

Browse Source 
This reverts commit 5a4e3f6423.
This commit is contained in:
7015725
2026-05-12 20:08:40 +08:00
parent 5a4e3f6423
commit 46393fe9ba
5 changed files with 12 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/th_02_core.js
View File

@@ -80,10 +80,6 @@ function FloatBallAppWM(logger) {
// 按钮管理首页：搜索过滤状态
buttonManagerQuery: "",
// 按钮编辑 App 化：编辑首页 / 基础信息子页 / 完整编辑页
buttonEditorSubPage: null,
buttonEditorDraft: null,
closing: false
};

189
code/th_14_panels.js
View File

@@ -560,178 +560,6 @@ FloatBallAppWM.prototype.createButtonEditorSectionCard = function(parent, title,
return box;
};
FloatBallAppWM.prototype.createButtonEditorHomeEntry = function(parent, title, desc, actionText, onClick) {
var self = this;
var isDark = this.isDarkTheme();
var C = this.ui.colors;
var row = new android.widget.LinearLayout(context);
row.setOrientation(android.widget.LinearLayout.HORIZONTAL);
row.setGravity(android.view.Gravity.CENTER_VERTICAL);
row.setPadding(this.dp(14), this.dp(12), this.dp(12), this.dp(12));
row.setBackground(this.ui.createRoundDrawable(isDark ? this.withAlpha(C.cardDark, 0.82) : this.withAlpha(C.cardLight, 0.92), this.dp(14)));
try { row.setElevation(this.dp(2)); } catch(eElev) { safeLog(null, 'e', "catch " + String(eElev)); }
var texts = new android.widget.LinearLayout(context);
texts.setOrientation(android.widget.LinearLayout.VERTICAL);
var tvTitle = new android.widget.TextView(context);
tvTitle.setText(String(title || ""));
tvTitle.setTextColor(isDark ? C.textPriDark : C.textPriLight);
tvTitle.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 15);
tvTitle.setTypeface(null, android.graphics.Typeface.BOLD);
texts.addView(tvTitle);
var tvDesc = new android.widget.TextView(context);
tvDesc.setText(String(desc || ""));
tvDesc.setTextColor(isDark ? C.textSecDark : C.textSecLight);
tvDesc.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 12);
tvDesc.setPadding(0, this.dp(3), this.dp(8), 0);
texts.addView(tvDesc);
var textLp = new android.widget.LinearLayout.LayoutParams(0, android.widget.LinearLayout.LayoutParams.WRAP_CONTENT);
textLp.weight = 1;
row.addView(texts, textLp);
var go = new android.widget.TextView(context);
go.setText(String(actionText || "进入") + " ›");
go.setTextColor(C.primary);
go.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 13);
go.setTypeface(null, android.graphics.Typeface.BOLD);
row.addView(go);
row.setOnClickListener(new android.view.View.OnClickListener({ onClick: function(v) {
try { self.touchActivity(); } catch(eT) {}
try { if (onClick) onClick(); } catch(eC) { try { self.toast("打开失败: " + String(eC)); } catch(eToast) {} }
}}));
var lp = new android.widget.LinearLayout.LayoutParams(android.widget.LinearLayout.LayoutParams.MATCH_PARENT, android.widget.LinearLayout.LayoutParams.WRAP_CONTENT);
lp.setMargins(this.dp(2), this.dp(6), this.dp(2), this.dp(6));
parent.addView(row, lp);
};
FloatBallAppWM.prototype.buildButtonEditorHomeView = function(buttons, editIdx, targetBtn) {
var self = this;
var isDark = this.isDarkTheme();
var C = this.ui.colors;
var subTextColor = isDark ? C.textSecDark : C.textSecLight;
var panel = this.ui.createStyledPanel(this, 16);
var box = new android.widget.LinearLayout(context);
box.setOrientation(android.widget.LinearLayout.VERTICAL);
box.setPadding(0, this.dp(2), 0, this.dp(8));
var summary = new android.widget.TextView(context);
summary.setText((editIdx === -1 ? "新增按钮" : "编辑按钮") + "：" + String(targetBtn && targetBtn.title ? targetBtn.title : "未命名") + "\n先进入子页调整内容，或打开完整编辑页使用原有全部选项。");
summary.setTextColor(subTextColor);
summary.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 12);
summary.setPadding(this.dp(4), 0, this.dp(4), this.dp(8));
box.addView(summary);
this.createButtonEditorHomeEntry(box, "基础信息", "编辑标题、启用状态等基础字段", "编辑", function() {
self.state.buttonEditorSubPage = "basic"; // button_editor_basic
self.state.keepBtnEditorState = true;
if (self.pushToolAppPage) self.pushToolAppPage("btn_editor");
else self.showPanelAvoidBall("btn_editor");
});
this.createButtonEditorHomeEntry(box, "图标外观", "图标来源、ShortX 图标与调色板（下一步拆分）", "稍后", function() {
self.toast("下一步拆分图标外观页");
});
this.createButtonEditorHomeEntry(box, "动作设置", "Shell / App / 广播 / Intent / 快捷方式（完整编辑可用）", "完整编辑", function() {
self.state.buttonEditorSubPage = "legacy"; // button_editor_legacy
self.state.keepBtnEditorState = true;
if (self.pushToolAppPage) self.pushToolAppPage("btn_editor");
else self.showPanelAvoidBall("btn_editor");
});
this.createButtonEditorHomeEntry(box, "完整编辑", "保留旧版完整表单，确保所有高级选项可继续编辑", "打开", function() {
self.state.buttonEditorSubPage = "legacy"; // button_editor_legacy
self.state.keepBtnEditorState = true;
if (self.pushToolAppPage) self.pushToolAppPage("btn_editor");
else self.showPanelAvoidBall("btn_editor");
});
panel.addView(box);
var bottom = new android.widget.LinearLayout(context);
bottom.setOrientation(android.widget.LinearLayout.HORIZONTAL);
bottom.setGravity(android.view.Gravity.END | android.view.Gravity.CENTER_VERTICAL);
bottom.setPadding(0, this.dp(10), 0, 0);
var btnCancel = this.ui.createFlatButton(this, "取消", subTextColor, function() {
self.state.editingButtonIndex = null;
self.state.buttonEditorSubPage = null;
self.state.buttonEditorDraft = null;
if (self.state.toolAppActive && self.popToolAppPage) {
self.state.keepBtnEditorState = true;
self.popToolAppPage("button_edit_home_cancel");
} else self.showPanelAvoidBall("btn_editor");
});
bottom.addView(btnCancel);
panel.addView(bottom);
return panel;
};
FloatBallAppWM.prototype.buildButtonBasicInfoPage = function(buttons, editIdx, targetBtn) {
var self = this;
var isDark = this.isDarkTheme();
var C = this.ui.colors;
var subTextColor = isDark ? C.textSecDark : C.textSecLight;
var panel = this.ui.createStyledPanel(this, 16);
var form = new android.widget.LinearLayout(context);
form.setOrientation(android.widget.LinearLayout.VERTICAL);
form.setPadding(this.dp(4), this.dp(4), this.dp(4), this.dp(4));
self.createButtonEditorSectionCard(form, "基础信息子页", "这里只改标题和启用状态；完整动作参数仍可进入完整编辑页调整。");
var inputTitle = self.ui.createInputGroup(self, "标题 (Title)", targetBtn.title, false, "按钮上显示的文字");
form.addView(inputTitle.view);
var enabledRow = new android.widget.LinearLayout(context);
enabledRow.setOrientation(android.widget.LinearLayout.HORIZONTAL);
enabledRow.setGravity(android.view.Gravity.CENTER_VERTICAL);
enabledRow.setPadding(0, self.dp(8), 0, self.dp(12));
var enabledTv = new android.widget.TextView(context);
enabledTv.setText("启用按钮");
enabledTv.setTextColor(isDark ? C.textPriDark : C.textPriLight);
enabledTv.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 14);
var enabledTvLp = new android.widget.LinearLayout.LayoutParams(0, android.widget.LinearLayout.LayoutParams.WRAP_CONTENT);
enabledTvLp.weight = 1;
enabledRow.addView(enabledTv, enabledTvLp);
var enabledSwitch = new android.widget.Switch(context);
enabledSwitch.setChecked(targetBtn.enabled === false ? false : true);
enabledRow.addView(enabledSwitch);
form.addView(enabledRow);
panel.addView(form);
var bottom = new android.widget.LinearLayout(context);
bottom.setOrientation(android.widget.LinearLayout.HORIZONTAL);
bottom.setGravity(android.view.Gravity.END | android.view.Gravity.CENTER_VERTICAL);
bottom.setPadding(0, self.dp(10), 0, 0);
var btnBack = self.ui.createFlatButton(self, "返回", subTextColor, function() {
if (self.state.toolAppActive && self.popToolAppPage) {
self.state.keepBtnEditorState = true;
self.popToolAppPage("button_basic_back");
} else self.showPanelAvoidBall("btn_editor");
});
bottom.addView(btnBack);
var spacer = new android.view.View(context);
spacer.setLayoutParams(new android.widget.LinearLayout.LayoutParams(self.dp(12), 1));
bottom.addView(spacer);
var btnSave = self.ui.createSolidButton(self, "保存基础信息", C.primary, android.graphics.Color.WHITE, function() {
try {
var newTitle = String(inputTitle.getValue ? inputTitle.getValue() : "").replace(/^\s+|\s+$/g, "");
if (!newTitle) { inputTitle.setError("标题不能为空"); return; }
targetBtn.title = newTitle;
targetBtn.enabled = !!enabledSwitch.isChecked();
if (editIdx === -1) {
buttons.push(targetBtn);
self.state.editingButtonIndex = buttons.length - 1;
} else {
buttons[editIdx] = targetBtn;
}
self.state.buttonEditorDraft = JSON.parse(JSON.stringify(targetBtn));
self.state.keepBtnEditorState = true;
self.toast("基础信息已暂存");
if (self.state.toolAppActive && self.popToolAppPage) self.popToolAppPage("button_basic_save");
else self.showPanelAvoidBall("btn_editor");
} catch(eSave) { self.toast("暂存失败: " + String(eSave)); }
});
bottom.addView(btnSave);
panel.addView(bottom);
return panel;
};
FloatBallAppWM.prototype.buildButtonEditorPanelView = function() {
var self = this;
// # 状态管理：editingIndex (null=列表, -1=新增, >=0=编辑)
@@ -803,8 +631,6 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() {
// 新增按钮 (右侧)
var btnAdd = self.ui.createSolidButton(self, "新增", C.primary, android.graphics.Color.WHITE, function() {
self.state.editingButtonIndex = -1;
self.state.buttonEditorSubPage = null;
self.state.buttonEditorDraft = null;
if (self.state.toolAppActive && self.pushToolAppPage) self.pushToolAppPage("btn_editor");
else refreshPanel();
});
@@ -896,8 +722,6 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() {
card.setOnClickListener(new android.view.View.OnClickListener({
onClick: function() {
self.state.editingButtonIndex = idx;
self.state.buttonEditorSubPage = null;
self.state.buttonEditorDraft = null;
if (self.state.toolAppActive && self.pushToolAppPage) self.pushToolAppPage("btn_editor");
else refreshPanel();
}
@@ -1174,18 +998,7 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() {
panel.setTag(header); // 暴露 Header
var editIdx = this.state.editingButtonIndex;
var targetBtn = (editIdx === -1) ? { type: "shell", title: "", cmd: "", iconResId: 0, enabled: true } : JSON.parse(JSON.stringify(buttons[editIdx]));
try {
if (this.state.buttonEditorDraft) {
var draftObj = JSON.parse(JSON.stringify(this.state.buttonEditorDraft));
if (draftObj) targetBtn = draftObj;
}
} catch(eDraft) { safeLog(null, 'e', "catch " + String(eDraft)); }
if (this.state.buttonEditorSubPage === "basic") return this.buildButtonBasicInfoPage(buttons, editIdx, targetBtn);
if (this.state.buttonEditorSubPage === "legacy") {
// 继续向下渲染旧版完整编辑表单
} else return this.buildButtonEditorHomeView(buttons, editIdx, targetBtn);
var targetBtn = (editIdx === -1) ? { type: "shell", title: "", cmd: "", iconResId: 0 } : JSON.parse(JSON.stringify(buttons[editIdx]));
var scroll = new android.widget.ScrollView(context);
try { scroll.setVerticalScrollBarEnabled(false); } catch(e) { safeLog(null, 'e', "catch " + String(e)); }

24
code/th_15_extra.js
View File

@@ -489,8 +489,6 @@ FloatBallAppWM.prototype.getToolAppTitle = function(route) {
if (r === "settings_group") return this.getSettingsGroupTitle ? this.getSettingsGroupTitle(this.state.settingsGroupKey) : "设置分组";
if (r === "btn_editor") {
if (this.state.editingButtonIndex !== null && this.state.editingButtonIndex !== undefined) {
if (this.state.buttonEditorSubPage === "basic") return "基础信息"; // button_editor_basic
if (this.state.buttonEditorSubPage === "legacy") return "完整编辑"; // button_editor_legacy
return (this.state.editingButtonIndex === -1) ? "新增按钮" : "编辑按钮";
}
return "按钮管理";
@@ -628,20 +626,9 @@ FloatBallAppWM.prototype.replaceToolAppPage = function(route) {
FloatBallAppWM.prototype.popToolAppPage = function(reason) {
try {
var curRoute = this.state.toolAppRoute ? String(this.state.toolAppRoute) : "";
if (curRoute === "btn_editor") {
if (this.state.editingButtonIndex !== null && this.state.editingButtonIndex !== undefined) {
if (this.state.buttonEditorSubPage !== null && this.state.buttonEditorSubPage !== undefined) {
this.state.buttonEditorSubPage = null;
this.state.keepBtnEditorState = true;
} else {
this.state.editingButtonIndex = null;
this.state.buttonEditorDraft = null;
this.state.keepBtnEditorState = true;
}
} else {
this.state.buttonEditorSubPage = null;
this.state.buttonEditorDraft = null;
}
if (curRoute === "btn_editor" && this.state.editingButtonIndex !== null && this.state.editingButtonIndex !== undefined) {
this.state.editingButtonIndex = null;
this.state.keepBtnEditorState = true;
}
if (curRoute === "schema_editor" && this.state.editingSchemaIndex !== null && this.state.editingSchemaIndex !== undefined) {
this.state.editingSchemaIndex = null;
@@ -652,11 +639,6 @@ FloatBallAppWM.prototype.popToolAppPage = function(reason) {
return true;
}
this.state.toolAppNavStack.pop();
var rr = String(reason || "");
if (curRoute === "btn_editor" && rr.indexOf("button_edit_") === 0 && this.state.editingButtonIndex === null && this.state.toolAppNavStack.length > 1) {
var prevTop = this.state.toolAppNavStack[this.state.toolAppNavStack.length - 1];
if (prevTop && String(prevTop.route || "") === "btn_editor") this.state.toolAppNavStack.pop();
}
var top = this.state.toolAppNavStack[this.state.toolAppNavStack.length - 1];
var nextRoute = top && top.route ? String(top.route) : "settings";
if (nextRoute !== "settings_group") this.state.settingsGroupKey = null;

14
manifest.json
View File

@@ -6,8 +6,8 @@
"size": 52546
},
"th_02_core.js": {
"sha256": "885e3f68c62fb431985ab27b10bcfaeb1305ad68cc00b8b3c29e2583e981766d",
"size": 4346
"sha256": "24363adc7156feda5c2f1fcbb84c96a4378ffec4b40251bd27d0123329acf054",
"size": 4203
},
"th_03_icon.js": {
"sha256": "717f7f37474d3616c2cd944581455f600020a850ec8812100d0546ec1302c987",
@@ -54,12 +54,12 @@
"size": 20386
},
"th_14_panels.js": {
"sha256": "5738aa11c1d3438bba82dadb2098cf1fdd17fadc2394403f7a534c4e36bce282",
"size": 241632
"sha256": "5ed0c2ece79efe2d67e3c0b6f85e8e2b24980d4a46de3fafc7a461940801a936",
"size": 231980
},
"th_15_extra.js": {
"sha256": "26fdfd57eec99a5a096ef54df005ba728814698201219fb050681bf4d0de29a7",
"size": 72274
"sha256": "b48c16ea5cbe5b9033d593eb18ef3028c0d661c65cbf2ad8f3f650ee55bbe2e4",
"size": 71280
},
"th_16_entry.js": {
"sha256": "e7c99c3dfbd6aedab05551426955081ae6cae034754f2f557cefa01dc75dc001",
@@ -68,5 +68,5 @@
},
"keyId": "toolhub-targets-2026-rsa3072",
"schema": 2,
"version": 20260512120115
"version": 20260512120949
}

2
manifest.sig
View File

@@ -1 +1 @@
ciISTFMH4eWNZsDXAKXGVsniU3f7nUza8HqTfnUhASeAjeqwDmJN8KXLo5fchS6c0q+//fuJt/yjwgLrvxgROnQ488HfzLQE04Y7nEaIFFI8wwSLk9n1kktEMUKRoXz+FhZyCYCozPyrLiAfyAygOhsYRTg66bdqSjTwAWLqDVNy//ajuHAxShGoE0VzQqcCubKplo2+Z12r6LJvjivTWI0Dc1YTtCbIMK230Q7MfNg1Z3Ux8/GjxGxECnmDevKE9Qrxl20fFkjaMcyfU+yhHXgl9D5pSfcDDGjSVGxTJ8NtHPxJA4qkJBLcRr+9Dc5p7dWgVSJO1yiCUhsb5y3wtUSjVyOKAeQ06uhneFOUDY2WZN6+p8wFgvKaXdaMe2OvCzaqJlZEdV6IiW81uzCs/fvsewNu7wipxs6qZAkE6Y7gZMoyd1/FDCGzqW0tG2bCPfMnmTjw+2kBJi9oCPRWBELeZ90auCJ8LW0Gdc+u3FkjDsE6tr6bDSa0vVKgWkWO
gU+hIRBv2e9XZsdjiMYpra5GZEETvN6tJJ7+4JCk0UogctlzVFOkk+oab5QPfjIgZLlHxE46oonrycaMlMeOoiH8eYZtEQgwrMqLnuWDuTeGNb3pkIaXCyRbZWMd8CCODZWbzlljgwYt9p1L9J7Ovu0D3hFfS4EgwqB5OSYVkkhO/RGs+JbAFmNIRFVMiU8Uw0K7tTIwLxlvHf6SHuMeFQi2XVemHn23bXrbhzgO3Mn+QStkGn1bF5HMNHN1IF5UU6a2YG0pb4eApwVW9xKzYlAhBloOC/6r4eOvixT0FiVA+2bRdffFCf3bfxv51XmNwLcQp+PV9vn4bpSiqEsLUVZ72uyW90Q7F4FPl4+Ef5BP5ICMMDJ/943zA0L5uBErhlVn44yeuh/bzZ19Tvjs+xPEtsUmx0qQ7I6tC0uDe6pq6QYLwUmWaNMZTDlIbWCBK+GfBS6BZ2a83Q6P/pRG1eF7qJnXUdfckX5QedBIDd7UyzpeCD5qpeGXNQ9ZZ5d/