working reorder
This commit is contained in:
		
							parent
							
								
									2bdf0a90bc
								
							
						
					
					
						commit
						1e953d7d84
					
				@ -59,5 +59,9 @@
 | 
			
		||||
    "current-dpi-is": "Current DPI is",
 | 
			
		||||
    "usb-one-device": "Make sure ONLY your watch is connected",
 | 
			
		||||
    "accept-authorisation": "Please select \"Always Allow\" for authorisation on watch",
 | 
			
		||||
    "usb-not-connected": "Make sure your watch is not connected via USB"
 | 
			
		||||
    "usb-not-connected": "Make sure your watch is not connected via USB",
 | 
			
		||||
    "main-menu-item-11": "Global Theme",
 | 
			
		||||
    "enable-global-theme": "Enable Global Theme",
 | 
			
		||||
    "disable-global-theme": "Disable Global Theme",
 | 
			
		||||
    "main-menu-item-12": "Xiaomi Apps"
 | 
			
		||||
}
 | 
			
		||||
@ -15,8 +15,8 @@ module.exports = {
 | 
			
		||||
      choices: [
 | 
			
		||||
        '-----------------------',
 | 
			
		||||
        await Language.get('main-menu-item-1'),
 | 
			
		||||
        await Language.get('main-menu-item-2'),
 | 
			
		||||
        await Language.get('main-menu-item-3'),
 | 
			
		||||
        await Language.get('main-menu-item-12'),
 | 
			
		||||
        await Language.get('main-menu-item-11'),
 | 
			
		||||
        await Language.get('main-menu-item-4'),
 | 
			
		||||
        await Language.get('main-menu-item-5'),
 | 
			
		||||
        await Language.get('main-menu-item-6'),
 | 
			
		||||
@ -24,7 +24,6 @@ module.exports = {
 | 
			
		||||
        await Language.get('main-menu-item-8'),
 | 
			
		||||
        await Language.get('main-menu-item-10'),
 | 
			
		||||
        await Language.get('main-menu-item-9'),
 | 
			
		||||
        "global"
 | 
			
		||||
      ],
 | 
			
		||||
      filter: function (val) {
 | 
			
		||||
        return val.toLowerCase();
 | 
			
		||||
@ -144,11 +143,27 @@ module.exports = {
 | 
			
		||||
    const questions = [{
 | 
			
		||||
      type: "list",
 | 
			
		||||
      name: "globalSelection",
 | 
			
		||||
      message: await Language.get('global selection'),
 | 
			
		||||
      message: await Language.get('main-menu-item-11'),
 | 
			
		||||
      choices: [
 | 
			
		||||
        "Enable Global Theme",
 | 
			
		||||
        "Disable Global Theme"
 | 
			
		||||
      ],
 | 
			
		||||
        await Language.get('enable-global-theme'),
 | 
			
		||||
        await Language.get('disable-global-theme')
 | 
			
		||||
            ],
 | 
			
		||||
      filter: function (val) {
 | 
			
		||||
        return val.toLowerCase();
 | 
			
		||||
      },
 | 
			
		||||
    },];
 | 
			
		||||
    return inquirer.prompt(questions);
 | 
			
		||||
  },
 | 
			
		||||
  xiaomiMenu: async () => {
 | 
			
		||||
    Language.setActiveLang(await settings.value("Lang"))
 | 
			
		||||
    const questions = [{
 | 
			
		||||
      type: "list",
 | 
			
		||||
      name: "xiaomiSelection",
 | 
			
		||||
      message: await Language.get('main-menu-item-12'),
 | 
			
		||||
      choices: [
 | 
			
		||||
        await Language.get('main-menu-item-2'),
 | 
			
		||||
        await Language.get('main-menu-item-3')
 | 
			
		||||
            ],
 | 
			
		||||
      filter: function (val) {
 | 
			
		||||
        return val.toLowerCase();
 | 
			
		||||
      },
 | 
			
		||||
 | 
			
		||||
@ -232,9 +232,9 @@ module.exports = {
 | 
			
		||||
        const v = await inquirer.globalMenu()
 | 
			
		||||
        console.log(v)
 | 
			
		||||
        if (v.globalSelection === "enable global theme") {
 | 
			
		||||
            common.log('main-menu-item-1')
 | 
			
		||||
            common.header('main-menu-item-1')
 | 
			
		||||
            common.print('remove-xiaomi-apps', 'whiteBright')
 | 
			
		||||
            common.log('main-menu-item-11')
 | 
			
		||||
            common.header('main-menu-item-11')
 | 
			
		||||
            common.print('enable-global-theme', 'whiteBright')
 | 
			
		||||
            const removalPackagesList = files.loadPackageList()
 | 
			
		||||
            for (let package of removalPackagesList) {
 | 
			
		||||
                if (package.global === "X") {
 | 
			
		||||
@ -243,33 +243,43 @@ module.exports = {
 | 
			
		||||
            }
 | 
			
		||||
            common.print('removal-complete', 'green')
 | 
			
		||||
            await common.pause(2000)
 | 
			
		||||
            common.log('removal-complete')
 | 
			
		||||
            common.log('compatible-apps')
 | 
			
		||||
            // common.log('removal-complete')
 | 
			
		||||
            // common.log('compatible-apps')
 | 
			
		||||
            module.exports.mainMenu()
 | 
			
		||||
        } else {
 | 
			
		||||
            common.log('main-menu-item-1')
 | 
			
		||||
            common.header('main-menu-item-1')
 | 
			
		||||
            common.print('remove-xiaomi-apps', 'whiteBright')
 | 
			
		||||
            common.log('main-menu-item-11')
 | 
			
		||||
            common.header('main-menu-item-11')
 | 
			
		||||
            common.print('disable-global-theme', 'whiteBright')
 | 
			
		||||
            const removalPackagesList = files.loadPackageList()
 | 
			
		||||
            for (let package of removalPackagesList) {
 | 
			
		||||
                if (package.global === "X") {
 | 
			
		||||
                    await adb.restoreXiaomiApk(package.name)
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            common.print('removal-complete', 'green')
 | 
			
		||||
            // common.print('removal-complete', 'green')
 | 
			
		||||
            await common.pause(2000)
 | 
			
		||||
            common.log('removal-complete')
 | 
			
		||||
            common.log('compatible-apps')
 | 
			
		||||
            // common.log('removal-complete')
 | 
			
		||||
            // common.log('compatible-apps')
 | 
			
		||||
            module.exports.mainMenu()
 | 
			
		||||
        }
 | 
			
		||||
    },
 | 
			
		||||
 | 
			
		||||
    xiaomiApps: async () => {
 | 
			
		||||
        const v = await inquirer.xiaomiMenu()
 | 
			
		||||
        console.log(v)
 | 
			
		||||
        n = await Language.get('main-menu-item-2')
 | 
			
		||||
        if (v.xiaomiSelection === n.toLowerCase()) {
 | 
			
		||||
            module.exports.removeXiaomiApps()
 | 
			
		||||
        } else {
 | 
			
		||||
            module.exports.restoreXiaomiApps()
 | 
			
		||||
        }
 | 
			
		||||
    },
 | 
			
		||||
 | 
			
		||||
    mainMenu: async () => {
 | 
			
		||||
        common.header('Main Menu')
 | 
			
		||||
        const mainMenuSelection = await inquirer.mainMenu();
 | 
			
		||||
        menu_1 = await Language.get('main-menu-item-1')
 | 
			
		||||
        menu_2 = await Language.get('main-menu-item-2')
 | 
			
		||||
        menu_3 = await Language.get('main-menu-item-3')
 | 
			
		||||
        menu_12 = await Language.get('main-menu-item-12')
 | 
			
		||||
        menu_4 = await Language.get('main-menu-item-4')
 | 
			
		||||
        menu_5 = await Language.get('main-menu-item-5')
 | 
			
		||||
        menu_6 = await Language.get('main-menu-item-6')
 | 
			
		||||
@ -277,17 +287,18 @@ module.exports = {
 | 
			
		||||
        menu_8 = await Language.get('main-menu-item-8')
 | 
			
		||||
        menu_9 = await Language.get('main-menu-item-9')
 | 
			
		||||
        menu_10 = await Language.get('main-menu-item-10')
 | 
			
		||||
        menu_11 = await Language.get('main-menu-item-11')
 | 
			
		||||
 | 
			
		||||
        switch (mainMenuSelection.mainMenu) {
 | 
			
		||||
            case menu_1.toLowerCase():
 | 
			
		||||
                module.exports.oneClick()
 | 
			
		||||
                break;
 | 
			
		||||
            case menu_2.toLowerCase():
 | 
			
		||||
                module.exports.removeXiaomiApps()
 | 
			
		||||
                break;
 | 
			
		||||
            case menu_3.toLowerCase():
 | 
			
		||||
                module.exports.restoreXiaomiApps()
 | 
			
		||||
            case menu_12.toLowerCase():
 | 
			
		||||
                module.exports.xiaomiApps()
 | 
			
		||||
                break;
 | 
			
		||||
            // case menu_3.toLowerCase():
 | 
			
		||||
            //     module.exports.restoreXiaomiApps()
 | 
			
		||||
            //     break;
 | 
			
		||||
            case menu_4.toLowerCase():
 | 
			
		||||
                module.exports.installCompatibleApps()
 | 
			
		||||
                break;
 | 
			
		||||
@ -312,7 +323,7 @@ module.exports = {
 | 
			
		||||
            case menu_9.toLowerCase():
 | 
			
		||||
                process.kill(process.pid)
 | 
			
		||||
                break;
 | 
			
		||||
            case 'global':
 | 
			
		||||
            case menu_11.toLowerCase():
 | 
			
		||||
                module.exports.globalTheme();
 | 
			
		||||
                break;
 | 
			
		||||
            default:
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user