方案选择dialog修改为2列

Author: zzliux

src/system/schemeDialog.ts

@@ -3,6 +3,8 @@ import script from '@/system/script';
 import { MyFloaty } from './MyFloaty';
 import { IScheme } from '@/interface/IScheme';
 import { GroupSchemeName } from '@/common/schemeList';
+import { getHeightPixels, getWidthPixels } from '@auto.pro/core';
+
 
 export default {
 	show: (myfloaty: MyFloaty, schemeList?: IScheme[]) => {
@@ -16,7 +18,11 @@ export default {
             </androidx.core.widget.NestedScrollView>`
 		);
 		const title = '选择方案';
+		const screenWidth = getWidthPixels();
+		const screenHeight = getHeightPixels();
 		const schemeDialog = dialogs.build({ title, customView }).show();
+		schemeDialog.getWindow().setLayout(Math.max(screenWidth * 0.6, Math.min(576, screenWidth)), screenHeight * 0.8);
+
 		let groupSchemeNames: GroupSchemeName[] = store.get('groupSchemeNames');
 		if (!schemeList) {
 			schemeList = store.get('schemeList');
@@ -34,8 +40,13 @@ export default {
 		customView.groupList.on('item_bind', function (itemView, _itemHolder) {
 			const schemeListView = ui.inflate(
 				`<list id="groupSchemeList">
-                    <horizontal padding="10 10 10 10" bg="?selectableItemBackground" w="*">
-                        <text textColor="black" textSize="14" text="{{this}}" layout_gravity="center" />
+                    <horizontal w="*">
+                        <vertical w="0dp" layout_weight="1">
+                            <text padding="10 5 10 5" textColor="black" textSize="14" id="leftText" text="{{left}}" layout_gravity="center" />
+                        </vertical>
+                        <vertical w="0dp" layout_weight="1">
+                            <text padding="10 5 10 5" textColor="black" textSize="14" id="rightText" text="{{right}}" layout_gravity="center" />
+                        </vertical>
                     </horizontal>
                 </list>`,
 				itemView,
@@ -44,25 +55,61 @@ export default {
 		});
 
 		customView.groupList.on('item_data_bind', function (itemView, itemHolder) {
-			itemView.groupSchemeList.setDataSource(itemHolder.item.schemeNames);
-			itemView.groupSchemeList.on('item_click', function (item, _i, _itemView, _listView) {
-				const schemeName = item;
-				script.setCurrentScheme(schemeName);
-				const storeSettings = storeCommon.get('settings', {});
-				if (storeSettings.floaty_scheme_direct_run) {
-					// myfloaty.fy.start();
-					setTimeout(() => {
-						const storeSettings = storeCommon.get('settings', {});
-						if (storeSettings.floaty_scheme_openApp) {
-							script.launchRelatedApp();
-						}
-						myfloaty.thisRun();
-					}, 1000);
-				} else {
-					toast('设置方案[' + schemeName + ']');
+
+			const data: { left: string, right?: string }[] = [];
+			for (let i = 0; i < itemHolder.item.schemeNames.length; i+= 2) {
+				data.push({
+					left: itemHolder.item.schemeNames[i],
+					right: i + 1 < itemHolder.item.schemeNames.length ? itemHolder.item.schemeNames[i + 1] : ''
+				});
+			}
+			itemView.groupSchemeList.setDataSource(data);
+			itemView.groupSchemeList.on('item_data_bind', (itemView, itemHolder) => {
+				const textClick = (schemeName) => {
+					if (!schemeName) return;
+					script.setCurrentScheme(schemeName);
+					const storeSettings = storeCommon.get('settings', {});
+					if (storeSettings.floaty_scheme_direct_run) {
+						// myfloaty.fy.start();
+						setTimeout(() => {
+							const storeSettings = storeCommon.get('settings', {});
+							if (storeSettings.floaty_scheme_openApp) {
+								script.launchRelatedApp();
+							}
+							myfloaty.thisRun();
+						}, 1000);
+					} else {
+						toast('设置方案[' + schemeName + ']');
+					}
+					schemeDialog.dismiss();
 				}
-				schemeDialog.dismiss();
-			})
+				itemView.leftText.attr('foreground', '?selectableItemBackground');
+				itemView.leftText.click(() => {
+					textClick(itemHolder.item.left);
+				});
+				itemHolder.item.right && itemView.rightText.attr('foreground', '?selectableItemBackground');
+				itemHolder.item.right && itemView.rightText.click(() => {
+					textClick(itemHolder.item.right);
+				});
+			});
+			// itemView.groupSchemeList.on('item_click', function (item, _i, _itemView, _listView) {
+			// 	const schemeName = item;
+			// 	script.setCurrentScheme(schemeName);
+			// 	const storeSettings = storeCommon.get('settings', {});
+			// 	if (storeSettings.floaty_scheme_direct_run) {
+			// 		// myfloaty.fy.start();
+			// 		setTimeout(() => {
+			// 			const storeSettings = storeCommon.get('settings', {});
+			// 			if (storeSettings.floaty_scheme_openApp) {
+			// 				script.launchRelatedApp();
+			// 			}
+			// 			myfloaty.thisRun();
+			// 		}, 1000);
+			// 	} else {
+			// 		toast('设置方案[' + schemeName + ']');
+			// 	}
+			// 	schemeDialog.dismiss();
+			// })
 		});
 	},
 }