From de82e7240d66c4432810732deedaf85cc5d742a9 Mon Sep 17 00:00:00 2001
From: "karl.hudgell" <karl.hudgell@bjss.com>
Date: Sun, 6 Sep 2020 14:43:11 +0100
Subject: [PATCH] new menu item and change DPI

---
 lib/adb.js      | 23 ++++++++++++++++++++++-
 lib/inquirer.js | 11 +++++++++++
 pages/pages.js  | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/lib/adb.js b/lib/adb.js
index cfe8deb..d263fab 100644
--- a/lib/adb.js
+++ b/lib/adb.js
@@ -6,7 +6,7 @@ const inquirer = require('../lib/inquirer');
 const common = require('./common')
 const chalk = require('chalk');
 const globalVariables = require('../lib/globalVars');
-const { dualLog } = require('./common');
+const extractNumber = require('extract-numbers')
 
 if (process.platform === 'win32' || process.platform === 'win64') {
   adbRun = 'adb'
@@ -130,6 +130,27 @@ module.exports = {
     // common.log('')
     // common.dualLog('restarting-adb' + ' ' + result.stderr, 'red')
   },
+  getCurrentDPI: async () => {
+    Language.setActiveLang(globalVariables.language)
+    let result = await shellExec(adbRun + ' shell wm density')
+    if (result.stdout != "") {
+      currentDPI = extractNumber(result.stdout)
+      if (currentDPI.length > 1) {
+        return currentDPI[1]
+      } else {
+        return currentDPI[0]
+      }
+    } else {
+      return result.stderr
+    }
+
+  },
+  setDPI: async (setDPI) => {
+    Language.setActiveLang(globalVariables.language)
+    let result = await shellExec(adbRun + ' shell wm density ' + setDPI)
+    // currentDPI = extractNumber(result.stdout)
+    // return currentDPI[0]
+  },
   watchConnection: async (value) => {
     Language.setActiveLang(globalVariables.language)
     if (value.connection === "usb") {
diff --git a/lib/inquirer.js b/lib/inquirer.js
index b776c29..9900109 100644
--- a/lib/inquirer.js
+++ b/lib/inquirer.js
@@ -12,6 +12,7 @@ module.exports = {
       name: "mainMenu",
       message: await Language.get('main-menu-question'),
       choices: [
+        '-----------------------',
         await Language.get('main-menu-item-1'),
         await Language.get('main-menu-item-2'),
         await Language.get('main-menu-item-3'),
@@ -20,6 +21,7 @@ module.exports = {
         await Language.get('main-menu-item-6'),
         await Language.get('main-menu-item-7'),
         await Language.get('main-menu-item-8'),
+        await Language.get('main-menu-item-10'),
         await Language.get('main-menu-item-9'),
       ],
       filter: function (val) {
@@ -67,6 +69,15 @@ module.exports = {
     },];
     return inquirer.prompt(questions);
   },
+  setDPI: async () => {
+    Language.setActiveLang(globalVariables.language)
+    const questions = [{
+      type: "input",
+      name: "setDPI",
+      message: await Language.get('set-dpi-message'),
+    },];
+    return inquirer.prompt(questions);
+  },
   removeAppsList: async () => {
     Language.setActiveLang(globalVariables.language)
     const packages = await files.loadPackageList();
diff --git a/pages/pages.js b/pages/pages.js
index 9850710..32e104d 100644
--- a/pages/pages.js
+++ b/pages/pages.js
@@ -172,10 +172,38 @@ module.exports = {
         module.exports.mainMenu()
     },
 
+
+    changeWatchDPI: async () => {
+        common.header('main-menu-item-10')
+        common.log('main-menu-item-10')
+
+        const defaultDPI = 320
+        const currentDPI = await adb.getCurrentDPI()
+        console.log(chalk.white(await Language.get('default-dpi-is') + ' ' + defaultDPI))
+        await common.pause(1000)
+        console.log(chalk.whiteBright(await Language.get('current-dpi-is') + ' ' + currentDPI))
+        if (currentDPI.includes('error')) {
+            common.dualLog('failed', 'red')
+            await common.pause(2000)
+            module.exports.mainMenu()
+        } else {
+            await common.pause(1000)
+            const v = await inquirer.setDPI()
+            const setDPIValue = v.setDPI
+
+            const t = await adb.setDPI(setDPIValue)
+
+            common.dualLog('complete', 'green')
+            await common.pause(2000)
+            module.exports.mainMenu()
+        }
+    },
+
     connectWatch: async () => {
         common.header('connect-to-watch')
         common.log('connect-to-watch')
         const value = await inquirer.connectionType()
+        await common.pause(1000)
         connected = await adb.watchConnection(value)
         if (connected != true) {
             module.exports.connectWatch()
@@ -204,6 +232,7 @@ module.exports = {
         menu_7 = await Language.get('main-menu-item-7')
         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')
 
         switch (mainMenuSelection.mainMenu) {
             case menu_1.toLowerCase():
@@ -230,6 +259,12 @@ module.exports = {
             case menu_8.toLowerCase():
                 module.exports.batchRemoveInstalledApps()
                 break;
+            case '-----------------------':
+                module.exports.mainMenu()
+                break;
+            case menu_10.toLowerCase():
+                module.exports.changeWatchDPI()
+                break;
             case menu_9.toLowerCase():
                 break;
             default: