Karl/MiWatchKleaner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working reorder

Browse Source
This commit is contained in:
karl.hudgell 2020-09-15 12:38:36 +01:00
parent 2bdf0a90bc
commit 1e953d7d84
3 changed files with 57 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/en.json
View File

@ -59,5 +59,9 @@
"current-dpi-is": "Current DPI is", "current-dpi-is": "Current DPI is",
"usb-one-device": "Make sure ONLY your watch is connected", "usb-one-device": "Make sure ONLY your watch is connected",
"accept-authorisation": "Please select \"Always Allow\" for authorisation on watch", "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"
} }

29
lib/inquirer.js
View File

@ -15,8 +15,8 @@ module.exports = {
choices: [ choices: [
'-----------------------', '-----------------------',
await Language.get('main-menu-item-1'), await Language.get('main-menu-item-1'),
await Language.get('main-menu-item-2'), await Language.get('main-menu-item-12'),
await Language.get('main-menu-item-3'), await Language.get('main-menu-item-11'),
await Language.get('main-menu-item-4'), await Language.get('main-menu-item-4'),
await Language.get('main-menu-item-5'), await Language.get('main-menu-item-5'),
await Language.get('main-menu-item-6'), 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-8'),
await Language.get('main-menu-item-10'), await Language.get('main-menu-item-10'),
await Language.get('main-menu-item-9'), await Language.get('main-menu-item-9'),
"global"
], ],
filter: function (val) { filter: function (val) {
return val.toLowerCase(); return val.toLowerCase();
@ -144,11 +143,27 @@ module.exports = {
const questions = [{ const questions = [{
type: "list", type: "list",
name: "globalSelection", name: "globalSelection",
message: await Language.get('global selection'), message: await Language.get('main-menu-item-11'),
choices: [ choices: [
"Enable Global Theme", await Language.get('enable-global-theme'),
"Disable 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) { filter: function (val) {
return val.toLowerCase(); return val.toLowerCase();
}, },

49
pages/pages.js
View File

@ -232,9 +232,9 @@ module.exports = {
const v = await inquirer.globalMenu() const v = await inquirer.globalMenu()
console.log(v) console.log(v)
if (v.globalSelection === "enable global theme") { if (v.globalSelection === "enable global theme") {
common.log('main-menu-item-1') common.log('main-menu-item-11')
common.header('main-menu-item-1') common.header('main-menu-item-11')
common.print('remove-xiaomi-apps', 'whiteBright') common.print('enable-global-theme', 'whiteBright')
const removalPackagesList = files.loadPackageList() const removalPackagesList = files.loadPackageList()
for (let package of removalPackagesList) { for (let package of removalPackagesList) {
if (package.global === "X") { if (package.global === "X") {
@ -243,33 +243,43 @@ module.exports = {
} }
common.print('removal-complete', 'green') common.print('removal-complete', 'green')
await common.pause(2000) await common.pause(2000)
common.log('removal-complete') // common.log('removal-complete')
common.log('compatible-apps') // common.log('compatible-apps')
module.exports.mainMenu() module.exports.mainMenu()
} else { } else {
common.log('main-menu-item-1') common.log('main-menu-item-11')
common.header('main-menu-item-1') common.header('main-menu-item-11')
common.print('remove-xiaomi-apps', 'whiteBright') common.print('disable-global-theme', 'whiteBright')
const removalPackagesList = files.loadPackageList() const removalPackagesList = files.loadPackageList()
for (let package of removalPackagesList) { for (let package of removalPackagesList) {
if (package.global === "X") { if (package.global === "X") {
await adb.restoreXiaomiApk(package.name) await adb.restoreXiaomiApk(package.name)
} }
} }
common.print('removal-complete', 'green') // common.print('removal-complete', 'green')
await common.pause(2000) await common.pause(2000)
common.log('removal-complete') // common.log('removal-complete')
common.log('compatible-apps') // common.log('compatible-apps')
module.exports.mainMenu() 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 () => { mainMenu: async () => {
common.header('Main Menu') common.header('Main Menu')
const mainMenuSelection = await inquirer.mainMenu(); const mainMenuSelection = await inquirer.mainMenu();
menu_1 = await Language.get('main-menu-item-1') menu_1 = await Language.get('main-menu-item-1')
menu_2 = await Language.get('main-menu-item-2') menu_12 = await Language.get('main-menu-item-12')
menu_3 = await Language.get('main-menu-item-3')
menu_4 = await Language.get('main-menu-item-4') menu_4 = await Language.get('main-menu-item-4')
menu_5 = await Language.get('main-menu-item-5') menu_5 = await Language.get('main-menu-item-5')
menu_6 = await Language.get('main-menu-item-6') 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_8 = await Language.get('main-menu-item-8')
menu_9 = await Language.get('main-menu-item-9') menu_9 = await Language.get('main-menu-item-9')
menu_10 = await Language.get('main-menu-item-10') menu_10 = await Language.get('main-menu-item-10')
menu_11 = await Language.get('main-menu-item-11')
switch (mainMenuSelection.mainMenu) { switch (mainMenuSelection.mainMenu) {
case menu_1.toLowerCase(): case menu_1.toLowerCase():
module.exports.oneClick() module.exports.oneClick()
break; break;
case menu_2.toLowerCase(): case menu_12.toLowerCase():
module.exports.removeXiaomiApps() module.exports.xiaomiApps()
break;
case menu_3.toLowerCase():
module.exports.restoreXiaomiApps()
break; break;
// case menu_3.toLowerCase():
// module.exports.restoreXiaomiApps()
// break;
case menu_4.toLowerCase(): case menu_4.toLowerCase():
module.exports.installCompatibleApps() module.exports.installCompatibleApps()
break; break;
@ -312,7 +323,7 @@ module.exports = {
case menu_9.toLowerCase(): case menu_9.toLowerCase():
process.kill(process.pid) process.kill(process.pid)
break; break;
case 'global': case menu_11.toLowerCase():
module.exports.globalTheme(); module.exports.globalTheme();
break; break;
default: default: