version number

app.js

@@ -1,3 +1,15 @@
+const settings = require("settings-store")
+
+settings.init({
+    appName: "MiWatchKleaner", //required,
+    // publisherName: "Bar", //optional
+    // reverseDNS: "com.bar.foo" //required for macOS
+})
+
+// if (process.env.KLEANER_CLEAR_LANG = 'X') {
+//     settings.clear("Lang")
+// }
+
 const pages = require('./pages/pages')
 
 pages.selectLanguage()

data/xiaomiPackageRemovalList.json

@@ -1,45 +1,217 @@
-{
+[
-  "apps": [
+  {
-      "com.android.messaging",
+    "name": "com.android.messaging",
-      "com.google.android.clockwork.flashlight",
+    "klean": "X",
-      "com.google.android.clockwork.gestures.tutorial",
+    "global": ""
-      "com.google.android.clockwork.lesetup",
+  },
-      "com.google.android.inputmethod.pinyin",
+  {
-      "com.google.android.theme.baiji.default",
+    "name": "com.eg.android.AlipayGphone",
-      "com.google.android.wearable.frameworkpackagestubs",
+    "klean": "X",
-      "com.google.android.wearable.localedition.overlay.cmiit",
+    "global": ""
-      "com.google.android.wearable.overlay.common.baiji",
+  },
-      "com.google.android.wearable.overlay.helium.baiji",
+  {
-      "com.google.android.wearable.overlay.home.baiji",
+    "name": "com.google.android.clockwork.flashlight",
-      "com.google.android.wearable.overlay.home.baiji.tiles",
+    "klean": "X",
-      "com.gotokeep.keep",
+    "global": ""
-      "com.onetrack.watch",
+  },
-      "com.qb.qtranslator",
+  {
-      "com.sogou.ime.wear",
+    "name": "com.google.android.clockwork.gestures.tutorial",
-      "com.sogou.map.android.maps",
+    "klean": "X",
-      "com.tencent.qqmusicwatch",
+    "global": ""
-      "com.tigerbrokers.stock",
+  },
-      "com.umetrip.android.msky.app",
+  {
-      "com.xiaomi.mihome",
+    "name": "com.google.android.clockwork.lesetup",
-      "com.xiaomi.wear.anonymous.xiaoai",
+    "klean": "X",
-      "com.xiaomi.wear.calculator",
+    "global": ""
-      "com.xiaomi.wear.camera",
+  },
-      "com.xiaomi.wear.card",
+  {
-      "com.xiaomi.wear.charging",
+    "name": "com.google.android.inputmethod.pinyin",
-      "com.xiaomi.wear.compass",
+    "klean": "X",
-      "com.xiaomi.wear.deskclock",
+    "global": ""
-      "com.xiaomi.wear.hotwordle",
+  },
-      "com.xiaomi.wear.market",
+  {
-      "com.xiaomi.wear.mqs",
+    "name": "com.google.android.theme.baiji.default",
-      "com.xiaomi.wear.pressure",
+    "klean": "X",
-      "com.xiaomi.wear.setupprovider",
+    "global": ""
-      "com.xiaomi.wear.tutorial",
+  },
-      "com.xiaomi.wear.watchface.album",
+  {
-      "com.xiaomi.wear.watchface.art",
+    "name": "com.google.android.wearable.frameworkpackagestubs",
-      "com.xiaomi.wear.watchface.classic",
+    "klean": "",
-      "com.xiaomi.wear.watchface.decomposite",
+    "global": "X"
-      "com.xiaomi.wear.watchface.function",
+  },
-      "com.ximalayaos.wear.common",
+  {
-      "org.codeaurora.ims"
+    "name": "com.google.android.wearable.localedition.overlay.cmiit",
-  ]
+    "klean": "",
-}
+    "global": "X"
+  },
+  {
+    "name": "com.google.android.wearable.overlay.common.baiji",
+    "klean": "",
+    "global": "X"
+  },
+  {
+    "name": "com.google.android.wearable.overlay.helium.baiji",
+    "klean": "",
+    "global": "X"
+  },
+  {
+    "name": "com.google.android.wearable.overlay.home.baiji",
+    "klean": "",
+    "global": "X"
+  },
+  {
+    "name": "com.google.android.wearable.overlay.home.baiji.tiles",
+    "klean": "",
+    "global": "X"
+  },
+  {
+    "name": "com.gotokeep.keep",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.onetrack.watch",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.qb.qtranslator",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.sogou.ime.wear",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.sogou.map.android.maps",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.tencent.qqmusicwatch",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.tigerbrokers.stock",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.umetrip.android.msky.app",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.mihome",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.anonymous.xiaoai",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.calculator",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.camera",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.card",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.charging",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.compass",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.deskclock",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.hotwordle",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.market",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.mqs",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.pressure",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.setupprovider",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.tutorial",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.watchface.album",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.watchface.art",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.watchface.classic",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.watchface.decomposite",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.watchface.function",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.ximalayaos.wear.common",
+    "klean": "X",
+    "global": ""
+  },
+  {
+    "name": "com.xiaomi.wear.xiaoai",
+    "klean": "",
+    "global": ""
+  },
+  {
+    "name": "org.codeaurora.ims",
+    "klean": "X",
+    "global": ""
+  }
+]

lang/de.json

@@ -1,56 +1,67 @@
 {
-    "main-menu-question": "What do you want to do?",
+    "alberto-locale-activated-on-watch": "Alberto Locale aktiviert auf der Uhr",
-    "main-menu-item-1": "1-Click Karl0ss Klean",
+    "batch-install-apps-complete": "Stapel-Installation von Apps abgeschlossen",
-    "main-menu-item-2": "Remove Xiaomi Apps",
+    "compatible-apps": "Kompatible Apps",
-    "main-menu-item-3": "Restore Xiaomi Apps",
+    "compatible-apps-installed": "Kompatible Apps installiert",
-    "main-menu-item-4": "Install Compatible Apps",
+    "complete": "Abgeschlossen",
-    "main-menu-item-5": "Restore ANY app",
+    "connect-to-watch": "Verbinde mit Uhr",
-    "main-menu-item-6": "Remove ANY app",
+    "connect-wifi-complete": "Verbindung über WiFi hergestellt",
-    "main-menu-item-7": "Batch Install Apps",
+    "connect-wifi-message": "Wie ist die IP-Adresse deiner MiWatch?",
-    "main-menu-item-8": "Batch Remove Installed Apps",
+    "connected": "Verbunden",
-    "main-menu-item-9": "Quit",
+    "connected-via-usb": "Verbunden mit USB",
-    "connection-type-message": "How do you want to connect?",
+    "connected-via-wifi": "Verbunden über WiFi",
-    "connect-wifi-message":"What is your MiWatch IpAdress?",
+    "connection-type-message": "Wie möchtest du dich verbinden?",
-    "restore-app-message": "What apps do you want to restore?",
+    "device-not-authorised": "Gerät nicht autorisiert",
-    "install-compatible-apps-message": "What apps do you want to Install?",
+    "downloading-compatible-apps": "Lade kompatible Apps herunter",
-    "remove-installed-apps-message": "What Installed apps do you want to remove?",
+    "downloading-latest": "Lade aktuellste Version",
-    "restore-any-app-message": "What App do you want to restore?",
+    "error": "Fehler",
-    "header-remove-installed-apps": "Remove Installed Apps",
+    "error-device-not-authorised": "Fehler - Gerät nicht autorisiert",
-    "packages-recieved-from-watch": "Packages recieved from watch",
+    "failed": "Fehlgeschlagen",
-    "device-not-authorised": "Device not authorised",
+    "header-remove-installed-apps": "Entferne installierte Apps",
-    "restarting-adb": "Restarting ADB",
+    "install-compatible-apps-header": "Installation kompatible Apps",
-    "please-reconnect-to-watch": "Please reconnect to watch",
+    "install-compatible-apps-message": "Welche Apps möchtest du installieren?",
-    "remove-installed-apps-failed": "Remove Installed Apps Failed",
+    "installing": "Installiere",
-    "removing": "Removing",
+    "installing-apps": "Installiere Apps",
-    "removal-complete": "Removal Complete",
+    "main-menu-item-1": "1-Klick Karl0ss Klean",
-    "installing": "Installing",
+    "main-menu-item-2": "Entferne Xiaomi Apps",
-    "restoring": "Restoring",
+    "main-menu-item-3": "Wiederherstellung von Xiaomi Apps",
-    "remove-selected-user-apps": "Removed Selected User Apps",
+    "main-menu-item-4": "Installiere kompatible Apps",
-    "install-compatible-apps-header": "Install Compatible Apps",
+    "main-menu-item-5": "Wiederherstellung beliebiger App",
-    "simple-weather-activated-on-watch": "simpleWeather Activated On Watch",
+    "main-menu-item-6": "Entferne beliebige App",
-    "morelocale-activated-on-watch": "moreLocale Activated On Watch",
+    "main-menu-item-7": "Stapel-Installation von Apps",
-    "alberto-locale-activated-on-watch": "Alberto Locale Activated On Watch",
+    "main-menu-item-8": "Stapel-Deinstallation von installierten Apps",
-    "compatible-apps-installed": "Compatible Apps Installed",
+    "main-menu-item-9": "Beenden",
-    "compatible-apps": "Compatible Apps",
+    "main-menu-question": "Was möchtest du tun?",
-    "remove-xiaomi-apps": "Remove Xiaomi Apps",
+    "morelocale-activated-on-watch": "moreLocale aktiviert auf der Uhr",
-    "downloading-compatible-apps": "Downloading Compatible Apps",
+    "not-authenticated": "Nicht autorisiert",
-    "installing-apps": "Installing Apps",
+    "not-connected": "Nicht verbunden",
-    "downloading-latest": "Downloading Latest",
+    "not-found": "Nicht gefunden",
-    "complete": "Complete",
+    "packages-recieved-from-watch": "Pakete erhalten von der Uhr",
-    "failed": "Failed",
+    "please-reconnect-to-watch": "Bitte verbinde deine Uhr erneut",
-    "restoring-apps-complete": "Restoring Apps Complete",
+    "removal-complete": "Deinstallation abgeschlossen",
-    "batch-install-apps-complete": "Batch Install Apps Complete",
+    "remove-any-app-message": "Welche App möchtest du entfernen?",
-    "connect-to-watch": "Connect to watch",
+    "remove-installed-apps-failed": "Deinstallation von Apps fehlgeschlagen",
-    "connected-via-usb": "Connected via USB",
+    "remove-installed-apps-message": "Welche installierten Apps möchtest du entfernen?",
-    "connected-via-wifi": "Connected via Wifi",
+    "remove-selected-user-apps": "Entferne ausgewählte Benutzer-Apps",
-    "connected": "Connected",
+    "remove-xiaomi-apps": "Emtferne Xiaomi Apps",
-    "not-connected": "Not Connected",
+    "removing": "Entferne",
-    "error-device-not-authorised": "Error - Device not authorised",
+    "removing-apps-complete": "Deinstallation der Apps abgeschlossen",
-    "not-found": "Not Found",
+    "restarting-adb": "Neustart ADB",
-    "try-again": "Try Again",
+    "restore-any-app-message": "Welche App möchtest du wiederherstellen?",
-    "connect-wifi-complete": "Connect Wifi Complete",
+    "restore-app-message": "Welche Apps möchtest du wiederherstellen?",
-    "not-authenticated": "Not Authenticated",
+    "restoring": "Wiederherstellung in Gang",
-    "error": "Error",
+    "restoring-apps-complete": "Wiederherstellung von Apps abgeschlossen",
-    "remove-any-app-message": "What App do you want to remove?",
+    "simple-weather-activated-on-watch": "simpleWeather aktiviert auf der Uhr",
-    "removing-apps-complete": "Removing Apps Complete"
+    "try-again": "Versuche erneut",
+    "main-menu-item-10": "Watch DPI ändern",
+    "set-dpi-message": "Neuen DPI-Wert eingeben:",
+    "default-dpi-is": "Standard-DPI ist",
+    "current-dpi-is": "aktuelle DPI ist ",
+    "usb-one-device": "Stellen Sie sicher, dass NUR Ihre Uhr angeschlossen ist",
+    "accept-authorisation": "Bitte wählen Sie \"Immer zulassen\" für die Autorisierung auf der Uhr",
+    "usb-not-connected": "Stellen Sie sicher, dass Ihre Uhr nicht über USB angeschlossen ist",
+    "main-menu-item-11": "Global Theme",
+    "enable-global-theme": "Enable Global Theme",
+    "disable-global-theme": "Disable Global Theme",
+    "main-menu-item-12": "Xiaomi Apps"
 }

lang/en.json

@@ -10,7 +10,7 @@
     "main-menu-item-8": "Batch Remove Installed Apps",
     "main-menu-item-9": "Quit",
     "connection-type-message": "How do you want to connect?",
-    "connect-wifi-message":"What is your MiWatch IpAdress?",
+    "connect-wifi-message": "What is your MiWatch IpAdress?",
     "restore-app-message": "What apps do you want to restore?",
     "install-compatible-apps-message": "What apps do you want to Install?",
     "remove-installed-apps-message": "What Installed apps do you want to remove?",
@@ -52,5 +52,16 @@
     "not-authenticated": "Not Authenticated",
     "error": "Error",
     "remove-any-app-message": "What App do you want to remove?",
-    "removing-apps-complete": "Removing Apps Complete"
+    "removing-apps-complete": "Removing Apps Complete",
+    "main-menu-item-10": "Change Watch DPI",
+    "set-dpi-message": "Enter New DPI Value:",
+    "default-dpi-is": "Default DPI is",
+    "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",
+    "main-menu-item-11": "Global Theme",
+    "enable-global-theme": "Enable Global Theme",
+    "disable-global-theme": "Disable Global Theme",
+    "main-menu-item-12": "Xiaomi Apps"
 }

lang/es.json

@@ -52,5 +52,16 @@
     "not-authenticated": "No Autenticado",
     "error": "Error",
     "remove-any-app-message": "¿Qué Aplicación quieres borrar?",
-    "removing-apps-complete": "Borrado de Aplicaciones Finalizado"
+    "removing-apps-complete": "Borrado de Aplicaciones Finalizado",
+    "main-menu-item-10": "Cambiar DPI del reloj",
+    "set-dpi-message": "Introduzca un nuevo valor de DPI:",
+    "default-dpi-is": "El DPI predeterminado es",
+    "current-dpi-is": "Actual DPI es",
+    "usb-one-device": "Asegúrate de que SOLO tu reloj esté conectado",
+    "accept-authorisation": "Selecciona \"Permitir siempre\" para la autorización de servicio",
+    "usb-not-connected": "Asegúrese de que su reloj no esté conectado a través de 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"
 }

lang/fr.json

@@ -1 +1,67 @@
-{"alberto-locale-activated-on-watch":"Alberto Locale activé sur la montre","batch-install-apps-complete":"Installation des lots d'applications terminées","compatible-apps":"Applications compatibles","compatible-apps-installed":"Applications compatibles installées","complete":"Terminé","connect-to-watch":"Connectez-vous à la montre","connect-wifi-complete":"Connexion par Wifi effectuée","connect-wifi-message":"Quelle est l'adresse IP de votre Mi Watch ?","connected":"Connecté","connected-via-usb":"Connecté par USB","connected-via-wifi":"Connecté par WiFi","connection-type-message":"Comment voulez-vous vous connecter ?","device-not-authorised":"Appareil non autorisé","downloading-compatible-apps":"Téléchargement des applications compatibles en cours","downloading-latest":"Téléchargement de la dernière version","error":"Erreur","error-device-not-authorised":"Erreur - Appareil non autorisé","failed":"Échoué","header-remove-installed-apps":"Supprimer des applications installées","install-compatible-apps-header":"Installer des applications compatibles","install-compatible-apps-message":"Quelles applications voulez-vous installer ?","installing":"Installation en cours","installing-apps":"Installation des applications en cours","main-menu-item-1":"1-Click Karl0ss Klean","main-menu-item-2":"Supprimer les applications Xiaomi","main-menu-item-3":"Restaurer les applications Xiaomi","main-menu-item-4":"Installer des applications compatibles","main-menu-item-5":"Restaurer une application","main-menu-item-6":"Supprimer une application","main-menu-item-7":"Installer plusieurs applications","main-menu-item-8":"Supprimer plusieurs applications","main-menu-item-9":"Quitter","main-menu-question":"Que souhaitez-vous faire ?","morelocale-activated-on-watch":"moreLocale activé sur la montre","not-authenticated":"Non authentifié","not-connected":"Non connecté","not-found":"Introuvable","packages-recieved-from-watch":"Packets reçus depuis la montre","please-reconnect-to-watch":"Merci de reconnecter la montre","removal-complete":"Suppression terminée","remove-any-app-message":"Quelle application voulez-vous supprimer ?","remove-installed-apps-failed":"La suppression d'applications installées a échoué","remove-installed-apps-message":"Quelles applications installées voulez-vous supprimer ?","remove-selected-user-apps":"Les applications sélectionnées ont été supprimées","remove-xiaomi-apps":"Supprimer les applications Xiaomi","removing":"Suppression en cours","removing-apps-complete":"Suppression d'application effectuée","restarting-adb":"Redémarrage d'ADB","restore-any-app-message":"Quelles applications voulez-vous restaurer ?","restore-app-message":"Quelles applications voulez-vous restaurer ?","restoring":"Restauration en cours","restoring-apps-complete":"Restauration des applications terminée","simple-weather-activated-on-watch":"simpleWeather activé sur la montre","try-again":"Réessayer"}
+{
+    "alberto-locale-activated-on-watch": "Alberto Locale activé sur la montre",
+    "batch-install-apps-complete": "Installation des lots d'applications terminées",
+    "compatible-apps": "Applications compatibles",
+    "compatible-apps-installed": "Applications compatibles installées",
+    "complete": "Terminé",
+    "connect-to-watch": "Connectez-vous à la montre",
+    "connect-wifi-complete": "Connexion par Wifi effectuée",
+    "connect-wifi-message": "Quelle est l'adresse IP de votre Mi Watch ?",
+    "connected": "Connecté",
+    "connected-via-usb": "Connecté par USB",
+    "connected-via-wifi": "Connecté par WiFi",
+    "connection-type-message": "Comment voulez-vous vous connecter ?",
+    "device-not-authorised": "Appareil non autorisé",
+    "downloading-compatible-apps": "Téléchargement des applications compatibles en cours",
+    "downloading-latest": "Téléchargement de la dernière version",
+    "error": "Erreur",
+    "error-device-not-authorised": "Erreur - Appareil non autorisé",
+    "failed": "Échoué",
+    "header-remove-installed-apps": "Supprimer des applications installées",
+    "install-compatible-apps-header": "Installer des applications compatibles",
+    "install-compatible-apps-message": "Quelles applications voulez-vous installer ?",
+    "installing": "Installation en cours",
+    "installing-apps": "Installation des applications en cours",
+    "main-menu-item-1": "1-Click Karl0ss Klean",
+    "main-menu-item-2": "Supprimer les applications Xiaomi",
+    "main-menu-item-3": "Restaurer les applications Xiaomi",
+    "main-menu-item-4": "Installer des applications compatibles",
+    "main-menu-item-5": "Restaurer une application",
+    "main-menu-item-6": "Supprimer une application",
+    "main-menu-item-7": "Installer plusieurs applications",
+    "main-menu-item-8": "Supprimer plusieurs applications",
+    "main-menu-item-9": "Quitter",
+    "main-menu-question": "Que souhaitez-vous faire ?",
+    "morelocale-activated-on-watch": "moreLocale activé sur la montre",
+    "not-authenticated": "Non authentifié",
+    "not-connected": "Non connecté",
+    "not-found": "Introuvable",
+    "packages-recieved-from-watch": "Packets reçus depuis la montre",
+    "please-reconnect-to-watch": "Merci de reconnecter la montre",
+    "removal-complete": "Suppression terminée",
+    "remove-any-app-message": "Quelle application voulez-vous supprimer ?",
+    "remove-installed-apps-failed": "La suppression d'applications installées a échoué",
+    "remove-installed-apps-message": "Quelles applications installées voulez-vous supprimer ?",
+    "remove-selected-user-apps": "Les applications sélectionnées ont été supprimées",
+    "remove-xiaomi-apps": "Supprimer les applications Xiaomi",
+    "removing": "Suppression en cours",
+    "removing-apps-complete": "Suppression d'application effectuée",
+    "restarting-adb": "Redémarrage d'ADB",
+    "restore-any-app-message": "Quelles applications voulez-vous restaurer ?",
+    "restore-app-message": "Quelles applications voulez-vous restaurer ?",
+    "restoring": "Restauration en cours",
+    "restoring-apps-complete": "Restauration des applications terminée",
+    "simple-weather-activated-on-watch": "simpleWeather activé sur la montre",
+    "try-again": "Réessayer",
+    "main-menu-item-10": "Changer le DPI de la montre",
+    "set-dpi-message": "Entrez une nouvelle valeur PPP:",
+    "default-dpi-is": "Le DPI par défaut est",
+    "current-dpi-is": "Le DPI actuel est",
+    "usb-one-device": "Assurez-vous que SEULE votre montre est connectée",
+    "accept-authorisation": "Veuillez sélectionner \"Toujours autoriser\" pour l'autorisation sur la montre",
+    "usb-not-connected": "Assurez-vous que votre montre n'est pas connectée 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"
+}

lang/gr.json

@@ -0,0 +1,67 @@
+{
+    "main-menu-question": "Τι θες να κάνεις?",
+    "main-menu-item-1": "1-Πάτησε Karl0ss Klean",
+    "main-menu-item-2": "Αφαίρεσε Xiaomi Εφαρμογές",
+    "main-menu-item-3": "Επανέφερε Xiaomi Εφαρμογές",
+    "main-menu-item-4": "Εγκατέστησε συμβατές Εφαρμογές",
+    "main-menu-item-5": "Επανέφερε οποιαδήποτε εφαρμογή",
+    "main-menu-item-6": "Αφαίρεσε οποιαδήποτε εφαρμογή",
+    "main-menu-item-7": "Εγκατέστησε ομάδα εφαρμογών",
+    "main-menu-item-8": "Απεγκατάστησε ομάδα εγκατεστημένων εφαρμογών",
+    "main-menu-item-9": "Έξοδος",
+    "connection-type-message": "Πως θέλεις να συνδεθείς?",
+    "connect-wifi-message": "Ποια είναι η IP διεύθυνση του MiWatch?",
+    "restore-app-message": "Ποιες Εφαρμογές θέλεις να επαναφέρεις?",
+    "install-compatible-apps-message": "Ποιες Εφαρμογές θέλεις να εγκαταστήσεις?",
+    "remove-installed-apps-message": "Ποιες εγκατεστημένες Εφαρμογές θέλεις να απεγκαταστήσεις?",
+    "restore-any-app-message": "Ποια Εφαρμογή θέλεις να επαναφέρεις?",
+    "header-remove-installed-apps": "Αφαίρεσε Εγκατεστημένες Εφαρμογές",
+    "packages-recieved-from-watch": "Τα πακέτα ελήφθησαν από το ρολόϊ",
+    "device-not-authorised": "Η συσκευή δεν εγκρίθηκε",
+    "restarting-adb": "Επανεκκίνηση ADB",
+    "please-reconnect-to-watch": "Παρακαλώ ξανασύνδεσε το ρολόϊ",
+    "remove-installed-apps-failed": "Αφαίρεση εγκατεστημένων εφαρμογών απέτυχε",
+    "removing": "Αφαίρεση",
+    "removal-complete": "Αφαίρεση Ολοκληρώθηκε",
+    "installing": "Εγκατάσταση",
+    "restoring": "Επαναφορά",
+    "remove-selected-user-apps": "Αφαιρέθηκαν Εφαρμογές επιλεγμένες από τον χρήστη",
+    "install-compatible-apps-header": "Εγκατέστησε συμβατές Εφαρμογές",
+    "simple-weather-activated-on-watch": "simpleWeather Ενεργοποιήθηκε στο ρολόϊ",
+    "morelocale-activated-on-watch": "moreLocale Ενεργοποιήθηκε στο ρολόϊ",
+    "alberto-locale-activated-on-watch": "Alberto Locale Ενεργοποιήθηκε στο ρολόϊ",
+    "compatible-apps-installed": "Συμβατές Εφαρμογές εγκαταστάθηκαν",
+    "compatible-apps": "Συμβατές Εφαρμογές",
+    "remove-xiaomi-apps": "Αφαίρεσε Xiaomi Εφαρμογές",
+    "downloading-compatible-apps": "Λήψη Συμβατών Εφαρμογών",
+    "installing-apps": "Εγκατάσταση Εφαρμογών",
+    "downloading-latest": "Λήψη τελευταίων",
+    "complete": "Ολοκληρώθηκε",
+    "failed": "Απέτυχε",
+    "restoring-apps-complete": "Επαναφορά Εφαρμογών Ολοκληρώθηκε",
+    "batch-install-apps-complete": "Πακέτο εγκατάστασης Εφαρμογών Ολοκληρώθηκε",
+    "connect-to-watch": "Συνδέσου στο ρολόϊ",
+    "connected-via-usb": "Συνδέθηκε με USB",
+    "connected-via-wifi": "Συνδέθηκε με Wifi",
+    "connected": "Συνδέθηκε",
+    "not-connected": "Δεν Συνδέθηκε",
+    "error-device-not-authorised": "Σφάλμα - Η συσκευή δεν εγκρίθηκε",
+    "not-found": "Δεν βρέθηκε",
+    "try-again": "Δοκίμασε ξανά",
+    "connect-wifi-complete": "Σύνδεση  Wifi Ολοκληρώθηκε",
+    "not-authenticated": "Δεν πιστοποιήθηκε",
+    "error": "Σφάλμα",
+    "remove-any-app-message": "Ποια Εφαρμογή θέλεις να αφαιρέσεις?",
+    "removing-apps-complete": "Αφαίρεση εφαρμογών ολοκληρώθηκε",
+    "main-menu-item-10": "Αλλαγή DPI παρακολούθησης",
+    "set-dpi-message": "Εισαγάγετε νέα τιμή DPI:",
+    "default-dpi-is": "Το προεπιλεγμένο DPI είναι",
+    "current-dpi-is": "το τρέχον DPI είναι",
+    "usb-one-device": "Βεβαιωθείτε ΜΟΝΟ ότι το ρολόι σας είναι συνδεδεμένο",
+    "accept-authorisation": "Επιλέξτε \"Να επιτρέπεται πάντα\" για εξουσιοδότηση στο ρολόι",
+    "usb-not-connected": "Βεβαιωθείτε ότι το ρολόι σας δεν είναι συνδεδεμένο μέσω 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"
+}

lang/he.json

@@ -52,5 +52,16 @@
     "not-authenticated": "לא התחבר",
     "error": "שגיאה",
     "remove-any-app-message": "איזה אפליקציות תרצה להסיר?",
-    "removing-apps-complete": "הסרה הושלמה בהצלחה"
+    "removing-apps-complete": "הסרה הושלמה בהצלחה",
+    "main-menu-item-10": "שנה DPI של שעון",
+    "set-dpi-message": "הזן ערך DPI חדש",
+    "default-dpi-is": "ברירת מחדל ל- DPI",
+    "current-dpi-is": "DPI הנוכחי הוא",
+    "usb-one-device": "וודא שהשעון שלך מחובר רק",
+    "accept-authorisation": "אנא בחר תמיד אפשר לצורך הרשאה בשעון",
+    "usb-not-connected": "וודא שהשעון שלך אינו מחובר באמצעות 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"
 }

lang/it.json

@@ -10,8 +10,8 @@
     "main-menu-item-8": "Rimuovi tutte le App Installate",
     "main-menu-item-9": "Esci",
     "connection-type-message": "Come vuoi connetterti?",
-    "connect-wifi-message":"Qualè l'indirizzo IP del tuo MiWatch?",
+    "connect-wifi-message": "Qualè l'indirizzo IP del tuo MiWatch?",
-	"restore-app-message": "Che apps vuoi ripristinare?",
+    "restore-app-message": "Che apps vuoi ripristinare?",
     "install-compatible-apps-message": "Che apps compatibili vuoi installare?",
     "remove-installed-apps-message": "Che apps Installate vuoi rimuovere?",
     "restore-any-app-message": "Che Apps vuoi ripristinare?",
@@ -52,5 +52,16 @@
     "not-authenticated": "Non Autenticato",
     "error": "Errore",
     "remove-any-app-message": "Che App vuoi rimuovere?",
-    "removing-apps-complete": "Rimozione Apps Completata"
+    "removing-apps-complete": "Rimozione Apps Completata",
+    "main-menu-item-10": "Cambia DPI orologio",
+    "set-dpi-message": "Immetti nuovo valore DPI:",
+    "default-dpi-is": "DPI predefinito è",
+    "current-dpi-is": "current DPI is",
+    "usb-one-device": "Assicurati che SOLO il tuo orologio sia connesso",
+    "accept-authorisation": "Seleziona \"Consenti sempre\" per l'autorizzazione sull'orologio",
+    "usb-not-connected": "Assicurati che l'orologio non sia connesso tramite 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"
 }

lang/nl.json

@@ -1 +1,67 @@
-{"main-menu-question":"Wat wil je doen?","main-menu-item-1":"1-Click Karl0ss Klean","main-menu-item-2":"Xiaomi Apps verwijderen","main-menu-item-3":"Xiaomi Apps herstellen","main-menu-item-4":"Compatible Apps installeren","main-menu-item-5":"Andere Apps herstellen","main-menu-item-6":"Andere Apps verwijderen","main-menu-item-7":"Batch Apps Installeren","main-menu-item-8":"Batch Geïnstalleerde Apps verwijderen","main-menu-item-9":"Afsluiten","connection-type-message":"Hoe wil je connectie maken?","connect-wifi-message":"Wat is het IpAdres van je miWatch?","restore-app-message":"Welke Apps wil je herstellen?","install-compatible-apps-message":"Welke Apps wil je installeren?","remove-installed-apps-message":"Welke geïnstalleerde Apps wil je verwijderen?","restore-any-app-message":"Welke App wil je herstellen?","header-remove-installed-apps":"Verwijderen Geïnstalleerde Apps","packages-recieved-from-watch":"Pakketten ontvangen van horloge","device-not-authorised":"Apparaat niet geauthoriseerd","restarting-adb":"ADB herstarten","please-reconnect-to-watch":"Opnieuw verbinden met Horloge aub","remove-installed-apps-failed":"Verwijderen van geïnstalleerde Apps mislukt","removing":"Verwijderen","removal-complete":"Verwijderen afgerond","installing":"Installeren","restoring":"Herstellen","remove-selected-user-apps":"Geselecteerde gebruiker Apps verwijderd","install-compatible-apps-header":"Installeren Compatible Apps","simple-weather-activated-on-watch":"simpleWeather Actief op Horloge","morelocale-activated-on-watch":"moreLocale Actief op Horloge","alberto-locale-activated-on-watch":"Alberto Locale Actief op Horloge","compatible-apps-installed":"Compatible Apps geïnstalleerd","compatible-apps":"Compatible Apps","remove-xiaomi-apps":"Verwijderen Xiaomi Apps","downloading-compatible-apps":"Downloaden van Compatible Apps","installing-apps":"Apps installeren","downloading-latest":"Laatste versie downloaden","complete":"Afgerond","failed":"Mislukt","restoring-apps-complete":"Herstellen Apps Afgerond","batch-install-apps-complete":"Batch Installeren Apps Afgerond","connect-to-watch":"Verbinden met Horloge","connected-via-usb":"Verbonden via USB","connected-via-wifi":"Verbonden via WiFi","connected":"Verbonden","not-connected":"Niet verbonden","error-device-not-authorised":"Error - Apparaat niet geauthoriseerd","not-found":"Niet gevonden","try-again":"Probeer opnieuw","connect-wifi-complete":"Verbinden via Wifi Afgerond","not-authenticated":"Niet geauthenticeerd","error":"Fout","remove-any-app-message":"Welke App wil je verwijderen?","removing-apps-complete":"Verwijderen van Apps Afgerond"}
+{
+    "main-menu-question": "Wat wil je doen?",
+    "main-menu-item-1": "1-Click Karl0ss Klean",
+    "main-menu-item-2": "Xiaomi Apps verwijderen",
+    "main-menu-item-3": "Xiaomi Apps herstellen",
+    "main-menu-item-4": "Compatible Apps installeren",
+    "main-menu-item-5": "Andere Apps herstellen",
+    "main-menu-item-6": "Andere Apps verwijderen",
+    "main-menu-item-7": "Batch Apps Installeren",
+    "main-menu-item-8": "Batch Geïnstalleerde Apps verwijderen",
+    "main-menu-item-9": "Afsluiten",
+    "connection-type-message": "Hoe wil je connectie maken?",
+    "connect-wifi-message": "Wat is het IpAdres van je miWatch?",
+    "restore-app-message": "Welke Apps wil je herstellen?",
+    "install-compatible-apps-message": "Welke Apps wil je installeren?",
+    "remove-installed-apps-message": "Welke geïnstalleerde Apps wil je verwijderen?",
+    "restore-any-app-message": "Welke App wil je herstellen?",
+    "header-remove-installed-apps": "Verwijderen Geïnstalleerde Apps",
+    "packages-recieved-from-watch": "Pakketten ontvangen van horloge",
+    "device-not-authorised": "Apparaat niet geauthoriseerd",
+    "restarting-adb": "ADB herstarten",
+    "please-reconnect-to-watch": "Opnieuw verbinden met Horloge aub",
+    "remove-installed-apps-failed": "Verwijderen van geïnstalleerde Apps mislukt",
+    "removing": "Verwijderen",
+    "removal-complete": "Verwijderen afgerond",
+    "installing": "Installeren",
+    "restoring": "Herstellen",
+    "remove-selected-user-apps": "Geselecteerde gebruiker Apps verwijderd",
+    "install-compatible-apps-header": "Installeren Compatible Apps",
+    "simple-weather-activated-on-watch": "simpleWeather Actief op Horloge",
+    "morelocale-activated-on-watch": "moreLocale Actief op Horloge",
+    "alberto-locale-activated-on-watch": "Alberto Locale Actief op Horloge",
+    "compatible-apps-installed": "Compatible Apps geïnstalleerd",
+    "compatible-apps": "Compatible Apps",
+    "remove-xiaomi-apps": "Verwijderen Xiaomi Apps",
+    "downloading-compatible-apps": "Downloaden van Compatible Apps",
+    "installing-apps": "Apps installeren",
+    "downloading-latest": "Laatste versie downloaden",
+    "complete": "Afgerond",
+    "failed": "Mislukt",
+    "restoring-apps-complete": "Herstellen Apps Afgerond",
+    "batch-install-apps-complete": "Batch Installeren Apps Afgerond",
+    "connect-to-watch": "Verbinden met Horloge",
+    "connected-via-usb": "Verbonden via USB",
+    "connected-via-wifi": "Verbonden via WiFi",
+    "connected": "Verbonden",
+    "not-connected": "Niet verbonden",
+    "error-device-not-authorised": "Error - Apparaat niet geauthoriseerd",
+    "not-found": "Niet gevonden",
+    "try-again": "Probeer opnieuw",
+    "connect-wifi-complete": "Verbinden via Wifi Afgerond",
+    "not-authenticated": "Niet geauthenticeerd",
+    "error": "Fout",
+    "remove-any-app-message": "Welke App wil je verwijderen?",
+    "removing-apps-complete": "Verwijderen van Apps Afgerond",
+    "main-menu-item-10": "Watch DPI wijzigen",
+    "set-dpi-message": "Voer nieuwe DPI-waarde in:",
+    "default-dpi-is": "Standaard DPI is",
+    "current-dpi-is": "huidige DPI is",
+    "usb-one-device": "Zorg ervoor dat ALLEEN uw horloge is aangesloten",
+    "accept-authorisation": "Selecteer \"Altijd toestaan​​\" voor autorisatie op horloge",
+    "usb-not-connected": "Zorg ervoor dat uw horloge niet is aangesloten 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"
+}

lang/pl.json

@@ -10,7 +10,7 @@
     "main-menu-item-8": "Usuń wiele aplikacji",
     "main-menu-item-9": "Wyjdź",
     "connection-type-message": "Jak chcesz się połączyć?",
-    "connect-wifi-message":"Jaki jest adres IP Twojego MiWatch?",
+    "connect-wifi-message": "Jaki jest adres IP Twojego MiWatch?",
     "restore-app-message": "Jakie aplikacje chcesz przywrócić?",
     "install-compatible-apps-message": "Jakie aplikacje chcesz zainstalować?",
     "remove-installed-apps-message": "Jakie zainstalowane aplikacje chcesz usunąć?",
@@ -52,5 +52,16 @@
     "not-authenticated": "Brak uwierzytelnienia",
     "error": "Błąd",
     "remove-any-app-message": "Którą aplikacje chcesz usunąć?",
-    "removing-apps-complete": "Usuwanie aplikacji zakończone"
+    "removing-apps-complete": "Usuwanie aplikacji zakończone",
+    "main-menu-item-10": "Zmień DPI zegarka",
+    "set-dpi-message": "Wprowadź nową wartość DPI:",
+    "default-dpi-is": "Default DPI to",
+    "bieżąca-dpi-to": "bieżąca wartość DPI to",
+    "usb-one-device": "Upewnij się, że TYLKO zegarek jest podłączony",
+    "accept-authorisation": "Aby uzyskać autoryzację na zegarku, wybierz Zawsze zezwalaj",
+    "usb-not-connected": "Upewnij się, że zegarek nie jest podłączony przez 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"
 }

lang/pt-br.json

@@ -10,7 +10,7 @@
     "main-menu-item-8": "Remover Apps por lote",
     "main-menu-item-9": "Sair",
     "connection-type-message": "Como você quer Conectar?",
-    "connect-wifi-message":"Qual o endereço IP do seu MiWatch?",
+    "connect-wifi-message": "Qual o endereço IP do seu MiWatch?",
     "restore-app-message": "Quais Apps você quer restaurar?",
     "install-compatible-apps-message": "Quais Apps você quer instalar?",
     "remove-installed-apps-message": "Quais APPs instalados você quer remover?",
@@ -52,5 +52,16 @@
     "not-authenticated": "Não Autenticado",
     "error": "Erro",
     "remove-any-app-message": "Qual App você quer remover?",
-    "removing-apps-complete": "Remoção de Apps Completa"
+    "removing-apps-complete": "Remoção de Apps Completa",
+    "main-menu-item-10": "Alterar DPI do relógio",
+    "set-dpi-message": "Digite o novo valor de DPI:",
+    "default-dpi-is": "O DPI padrão é",
+    "current-dpi-is": "o DPI atual é",
+    "usb-one-device": "Certifique-se de que SOMENTE seu relógio esteja conectado",
+    "accept-authorisation": "Selecione \"Sempre permitir\" para autorização no relógio",
+    "usb-not-connected": "Certifique-se de que seu relógio não esteja conectado 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"
 }

lang/ru.json

@@ -10,7 +10,7 @@
     "main-menu-item-8": "Пакетное удаление приложений",
     "main-menu-item-9": "Выход",
     "connection-type-message": "Тип соединения с часами?",
-    "connect-wifi-message":"IP адрес ваших часов?",
+    "connect-wifi-message": "IP адрес ваших часов?",
     "restore-app-message": "Какие приложения вы хотите восстановить?",
     "install-compatible-apps-message": "Какие приложения вы хотите установить?",
     "remove-installed-apps-message": "Какие приложения из установленных вы хотите удалить?",
@@ -52,5 +52,16 @@
     "not-authenticated": "Не аутентифицировано",
     "error": "Ошибка",
     "remove-any-app-message": "Какое приложение вы хотите удалить?",
-    "removing-apps-complete": "Removing Apps Complete"
+    "removing-apps-complete": "Удаление приложений завершено",
+    "main-menu-item-10": "Изменить разрешение часов",
+    "set-dpi-message": "Введите новое значение DPI:",
+    "default-dpi-is": "DPI по умолчанию",
+    "current-dpi-is": "текущий DPI",
+    "usb-one-device": "Убедитесь, что подключены ТОЛЬКО ваши часы",
+    "accept-authorisation": "Пожалуйста, выберите \"Всегда разрешать\" для авторизации на часах",
+    "usb-not-connected": "Убедитесь, что ваши часы не подключены через 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"
 }

lang/tr.json

@@ -0,0 +1,67 @@
+{
+    "main-menu-question": "Ne yapmak istiyorsunuz?",
+    "main-menu-item-1": "1-Tık Karl0ss Klean",
+    "main-menu-item-2": "Xiaomi Uygulamalarını Kaldır",
+    "main-menu-item-3": "Xiaomi Uygulamalarını Geri Yükle",
+    "main-menu-item-4": "Uyumlu Uygulamaları Kur",
+    "main-menu-item-5": "HERHANGİ BİR uygulamayı geri yükle",
+    "main-menu-item-6": "HERHANGİ BİR uygulamayı kaldır",
+    "main-menu-item-7": "Toplu Yükleme Uygulamaları",
+    "main-menu-item-8": "Yüklü Uygulamaları Toplu Olarak Kaldır",
+    "main-menu-item-9": "Çık",
+    "connection-type-message": "Nasıl bağlanmak istiyorsunuz?",
+    "connect-wifi-message": "MiWatch IpAdress'iniz nedir?",
+    "restore-app-message": "Hangi uygulamaları geri yüklemek istiyorsunuz?",
+    "install-compatible-apps-message": "Hangi uygulamaları yüklemek istiyorsunuz?",
+    "remove-installed-apps-message": "Hangi Yüklü uygulamaları kaldırmak istiyorsun?",
+    "restore-any-app-message": "Hangi Uygulamayı geri yüklemek istiyorsun?",
+    "header-remove-installed-apps": "Yüklü Uygulamaları Kaldır",
+    "packages-recieved-from-watch": "Saatten alınan paketler",
+    "device-not-authorised": "Cihaz yetkilendirilmedi",
+    "restarting-adb": "ADB yeniden başlatılıyor",
+    "please-reconnect-to-watch": "İzlemek için lütfen yeniden bağlanın",
+    "remove-installed-apps-failed": "Yüklü Uygulamaları Kaldırma Başarısız Oldu",
+    "removing": "Kaldırılıyor",
+    "removal-complete": "Kaldırma Tamamlandı",
+    "installing": "Kuruluyor",
+    "restoring": "Geri yükleniyor",
+    "remove-selected-user-apps": "Seçili Kullanıcı Uygulamaları Kaldırıldı",
+    "install-compatible-apps-header": "Uyumlu Uygulamaları Kur",
+    "simple-weather-activated-on-watch": "Saatte simpleWeather Etkinleştirildi",
+    "morelocale-activated-on-watch": "moreLocale Watch On Watch'ta Etkinleştirildi",
+    "alberto-locale-activated-on-watch": "Alberto Locale Watch On Activated",
+    "compatible-apps-installed": "Yüklü Uyumlu Uygulamalar",
+    "compatible-apps": "Uyumlu Uygulamalar",
+    "remove-xiaomi-apps": "Xiaomi Uygulamalarını Kaldır",
+    "downloading-compatible-apps": "Uyumlu Uygulamaları İndirme",
+    "installing-apps": "Uygulama Yükleme",
+    "downloading-latest": "En Son İndiriliyor",
+    "complete": "Tamamlandı",
+    "failed": "Başarısız",
+    "restoring-apps-complete": "Uygulamaları Geri Yükleme Tamamlandı",
+    "batch-install-apps-complete": "Toplu Yükleme Uygulamaları Tamamlandı",
+    "connect-to-watch": "İzlemeye bağlan",
+    "connected-via-usb": "USB ile bağlı",
+    "connected-via-wifi": "Wi-Fi ile bağlı",
+    "connected": "Bağlandı",
+    "not-connected": "Bağlı Değil",
+    "error-device-not-authorised": "Hata - Cihaz yetkilendirilmedi",
+    "not-found": "Bulunamadı",
+    "try-again": "Tekrar Deneyin",
+    "connect-wifi-complete": "Kablosuz Bağlantı Tamamlandı",
+    "not-authenticated": "Kimliği Doğrulanmadı",
+    "error": "Error",
+    "remove-any-app-message": "Hangi Uygulamayı kaldırmak istiyorsunuz?",
+    "removing-apps-complete": "Uygulamaları Kaldırma Tamamlandı",
+    "main-menu-item-10": "Saat DPI'yı Değiştir",
+    "set-dpi-message": "Yeni DPI Değerini Girin:",
+    "default-dpi-is": "Varsayılan DPI",
+    "current-dpi-is": "Geçerli DPI:",
+    "usb-one-device": "YALNIZCA saatinizin bağlı olduğundan emin olun",
+    "accept-authorisation": "Saatte yetkilendirme için lütfen \"Her Zaman İzin Ver\" seçeneğini seçin",
+    "usb-not-connected": "Saatinizin USB ile bağlı olmadığından emin olun",
+    "main-menu-item-11": "Global Theme",
+    "enable-global-theme": "Enable Global Theme",
+    "disable-global-theme": "Disable Global Theme",
+    "main-menu-item-12": "Xiaomi Apps"
+}

lang/vn.json

@@ -10,7 +10,7 @@
     "main-menu-item-8": "Gỡ bỏ hàng loạt các phần mềm đã cài",
     "main-menu-item-9": "Thoát",
     "connection-type-message": "Bạn muốn chọn kết nối nào",
-    "connect-wifi-message":"Địa chỉ IP của Miwatch của bạn là gì?",
+    "connect-wifi-message": "Địa chỉ IP của Miwatch của bạn là gì?",
     "restore-app-message": "Những phần mềm nào bạn muốn Khôi phục?",
     "install-compatible-apps-message": "Những phần mềm nào bạn muốn Cài đặt?",
     "remove-installed-apps-message": "Những phần mềm đã cài đặt nào bạn muốn gỡ bỏ?",
@@ -52,5 +52,16 @@
     "not-authenticated": "Không thể xác thực",
     "error": "Lỗi",
     "remove-any-app-message": "Bạn muốn gỡ bỏ Phần mềm nào?",
-    "removing-apps-complete": "Gỡ bỏ Phần mềm hoàn tất"
+    "removing-apps-complete": "Gỡ bỏ Phần mềm hoàn tất",
+    "main-menu-item-10": "Thay đổi DPI của Đồng hồ",
+    "set-dpi-message": "Nhập Giá trị DPI Mới:",
+    "default-dpi-is": "DPI mặc định là",
+    "current-dpi-is": "DPI hiện tại là",
+    "usb-one-device": "Đảm bảo CHỈ đồng hồ của bạn được kết nối",
+    "accept-authorisation": "Vui lòng chọn \"Luôn cho phép\" để ủy quyền trên đồng hồ",
+    "usb-not-connected": "Đảm bảo rằng đồng hồ của bạn không được kết nối qua 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"
 }

lib/adb.js

@@ -6,7 +6,9 @@ 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')
+const settings = require("settings-store");
+
 
 if (process.platform === 'win32' || process.platform === 'win64') {
   adbRun = 'adb'
@@ -16,7 +18,7 @@ if (process.platform === 'win32' || process.platform === 'win64') {
 
 module.exports = {
   installApk: async (element) => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     result = await shellExec(adbRun + ' install -r ' + element).then(async function (result) {
       if (result.stderr != '') {
         common.dualLog('device-not-authorised' + ' ' + result.stderr, 'red')
@@ -24,8 +26,8 @@ module.exports = {
       common.dualLog(element + ' - ' + result.stdout)
 
       if (element === "data\\apps\\simpleweather_base.apk") {
-        await common.downloadFile('http://kithub.cf/Karl/MiWatchKleaner-APKs/raw/master/Others/simpleweather_split_config.armeabi_v7a.apk', './data/apps/simpleweather_split_config.armeabi_v7a.apk')
+        await common.downloadFile('https://github.com/karl0ss/MiWatchKleaner-APKs/raw/master/Others/simpleweather_split_config.armeabi_v7a.apk', './data/apps/simpleweather_split_config.armeabi_v7a.apk')
-        await common.downloadFile('http://kithub.cf/Karl/MiWatchKleaner-APKs/raw/master/Others/simpleweather_split_config.xhdpi.apk', './data/apps/simpleweather_split_config.xhdpi.apk')
+        await common.downloadFile('https://github.com/karl0ss/MiWatchKleaner-APKs/raw/master/Others/simpleweather_split_config.xhdpi.apk', './data/apps/simpleweather_split_config.xhdpi.apk')
         await shellExec(adbRun + ' install-multiple "data\\apps\\simpleweather_base.apk" "data\\apps\\simpleweather_split_config.armeabi_v7a.apk" "data\\apps\\simpleweather_split_config.xhdpi.apk"').then(async function (result) {
           common.log(result)
           common.dualLog('simple-weather-activated-on-watch')
@@ -46,7 +48,7 @@ module.exports = {
     });
   },
   removeApk: async (package) => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     result = await shellExec(adbRun + ' uninstall ' + package)
     if (result.stderr != '') {
       common.dualLog('device-not-authorised' + ' ' + result.stderr, 'red')
@@ -55,7 +57,7 @@ module.exports = {
     }
   },
   removeXiaomiApk: async (package) => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     result = await shellExec(adbRun + ' shell pm uninstall -k --user 0 ' + package)
     if (result.stderr != '') {
       common.dualLog('device-not-authorised' + ' ' + result.stderr, 'red')
@@ -64,7 +66,7 @@ module.exports = {
     }
   },
   restoreXiaomiApk: async (package) => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     result = await shellExec(adbRun + ' shell cmd package install-existing ' + package)
     if (result.stderr != '') {
       common.dualLog('device-not-authorised' + ' ' + result.stderr, 'red')
@@ -73,7 +75,7 @@ module.exports = {
     }
   },
   restoreAnyApk: async (package) => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     result = await shellExec(adbRun + ' shell cmd package install-existing ' + package.removeAnyApp)
     if (result.stderr != '') {
       common.dualLog('device-not-authorised' + ' ' + result.stderr, 'red')
@@ -85,7 +87,7 @@ module.exports = {
     }
   },
   removeAnyApk: async (package) => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     result = await shellExec(adbRun + ' shell pm uninstall -k --user 0 ' + package.removeAnyApp)
     if (result.stderr != '') {
       common.dualLog('device-not-authorised' + ' ' + result.stderr, 'red')
@@ -97,7 +99,7 @@ module.exports = {
     }
   },
   getInstalledPacakges: async () => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     result = await shellExec(adbRun + ' shell pm list packages -3')
     logger.info(await Language.get('packages-recieved-from-watch'))
     if (result.stderr.includes('error')) {
@@ -125,14 +127,40 @@ module.exports = {
     }
   },
   killAdbServer: async () => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     let result = await shellExec(adbRun + ' kill-server')
     // common.log('')
     // common.dualLog('restarting-adb' + ' ' + result.stderr, 'red')
   },
+  getCurrentDPI: async () => {
+    Language.setActiveLang(await settings.value("Lang"))
+    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(await settings.value("Lang"))
+    let result = await shellExec(adbRun + ' shell wm density ' + setDPI)
+    // currentDPI = extractNumber(result.stdout)
+    // return currentDPI[0]
+  },
   watchConnection: async (value) => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     if (value.connection === "usb") {
+      common.dualLog(await Language.get('usb-one-device', 'whiteBright'))
+      await common.pause(2000)
+      common.dualLog(await Language.get('accept-authorisation', 'whiteBright'))
+      common.dualLog(await Language.get('--------------------', 'whiteBright'))
+      await common.pause(3000)
       await module.exports.killAdbServer()
       result = await shellExec(adbRun + ' devices')
       console.log(result.stdout)
@@ -150,7 +178,12 @@ module.exports = {
       }
     }
     if (value.connection === "wifi") {
+      common.dualLog(await Language.get('usb-not-connected', 'whiteBright'))
+      await common.pause(2000)
       const value = await inquirer.connectWifi();
+      common.dualLog(await Language.get('accept-authorisation', 'whiteBright'))
+      common.dualLog(await Language.get('--------------------', 'whiteBright'))
+      await common.pause(3000)
       await module.exports.killAdbServer()
       result = await shellExec(adbRun + ' connect ' + value.connectWifi)
       logger.info("Connect Wifi Result " + result.stdout)

lib/common.js

@@ -8,11 +8,12 @@ var shell = require('shelljs');
 const logger = require('perfect-logger');
 const Language = require("@shypes/language-translator");
 const globalVariables = require('../lib/globalVars');
+const settings = require("settings-store");
 var chalkRainbow = require('chalk-rainbow')
 
 module.exports = {
     header: async (page) => {
-        Language.setActiveLang(globalVariables.language)
+        Language.setActiveLang(await settings.value("Lang"))
         clear();
         console.log(
             chalkRainbow(
@@ -36,7 +37,7 @@ module.exports = {
         await new Promise(resolve => setTimeout(resolve, time));
     },
     connectionCheck: async () => {
-        Language.setActiveLang(globalVariables.language)
+        Language.setActiveLang(await settings.value("Lang"))
         if (globalVariables.localUSB === "X") {
             console.log(chalk.white('MiWatch: ') + chalk.green(await Language.get('connected-via-usb')))
         }
@@ -48,7 +49,7 @@ module.exports = {
         }
     },
     downloadFile: async (url, path) => {
-        Language.setActiveLang(globalVariables.language)
+        Language.setActiveLang(await settings.value("Lang"))
         const res = await fetch(url);
         // await module.exports.downloadSize(url)
         await new Promise(async (resolve, reject) => {
@@ -70,7 +71,13 @@ module.exports = {
     },
     getCompatibleAppsList: async () => {
         let settings = { method: "Get" };
-        const response = await fetch("http://kithub.cf/Karl/MiWatchKleaner-APKs/raw/master/compatibleApps.json", settings)
+        const response = await fetch("http://kithub.ga/Karl/MiWatchKleaner-APKs/raw/master/compatibleApps.json", settings)
+            .then(res => res.json())
+        return response
+    },
+    getXiaomiAppsList: async () => {
+        let settings = { method: "Get" };
+        const response = await fetch("http://kithub.ga/Karl/MiWatchKleaner/raw/master/data/xiaomiPackageRemovalList.json", settings)
             .then(res => res.json())
         return response
     },
@@ -81,7 +88,7 @@ module.exports = {
         logger.info(await Language.get(item, 'en'))
     },
     print: async (item, colour) => {
-        Language.setActiveLang(globalVariables.language)
+        Language.setActiveLang(await settings.value("Lang"))
         switch (colour) {
             case 'green':
                 console.log(chalk.green(await Language.get(item)))

lib/files.js

@@ -4,8 +4,10 @@ const tiny = require("@peterpanhihi/tiny");
 const getFilesIn = require('get-files-in')
 const globalVariables = require('../lib/globalVars');
 const Language = require("@shypes/language-translator");
+const settings = require("settings-store");
 
-Language.setActiveLang(globalVariables.language)
+
+Language.setActiveLang(settings.value("Lang"))
 
 
 module.exports = {

lib/globalVars.js

@@ -1,7 +1,6 @@
 class globalVariables {
     localUSB = "";
     miWatchIpaddress = "";
-    language = "";
     usersList=[];
  }
 

lib/inquirer.js

@@ -3,23 +3,26 @@ const files = require("./files");
 const common = require("./common");
 const Language = require("@shypes/language-translator");
 const globalVariables = require('../lib/globalVars');
+const settings = require("settings-store");
 
 module.exports = {
   mainMenu: async () => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     const questions = [{
       type: "list",
       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-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-5'),
         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) {
@@ -43,7 +46,7 @@ module.exports = {
     return inquirer.prompt(questions);
   },
   connectionType: async () => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     const questions = [{
       type: "list",
       name: "connection",
@@ -59,7 +62,7 @@ module.exports = {
     return inquirer.prompt(questions);
   },
   connectWifi: async () => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     const questions = [{
       type: "input",
       name: "connectWifi",
@@ -67,20 +70,33 @@ module.exports = {
     },];
     return inquirer.prompt(questions);
   },
-  removeAppsList: async () => {
+  setDPI: async () => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
-    const packages = await files.loadPackageList();
+    const questions = [{
+      type: "input",
+      name: "setDPI",
+      message: await Language.get('set-dpi-message'),
+    },];
+    return inquirer.prompt(questions);
+  },
+  xiaomiAppsList: async () => {
+    Language.setActiveLang(await settings.value("Lang"))
+    const packages = await common.getXiaomiAppsList();
+    let appList = []
+    packages.forEach(element => {
+      appList.push(element.name)
+    });
 
     const questions = [{
       type: "checkbox",
-      name: "removeAppsList",
+      name: "appList",
       message: await Language.get('restore-app-message'),
-      choices: packages.apps,
+      choices: appList,
     },];
     return inquirer.prompt(questions);
   },
   compatibleApps: async () => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     const compatibleApps = await common.getCompatibleAppsList()
     const appList = []
     for (let element of compatibleApps) {
@@ -95,7 +111,7 @@ module.exports = {
     return inquirer.prompt(questions);
   },
   installedApps: async (installedApps) => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     const questions = [{
       type: "checkbox",
       name: "removeAppsList",
@@ -105,7 +121,7 @@ module.exports = {
     return inquirer.prompt(questions);
   },
   restoreAnyApp: async () => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     const questions = [{
       type: "input",
       name: "restoreAnyApp",
@@ -114,7 +130,7 @@ module.exports = {
     return inquirer.prompt(questions);
   },
   removeAnyApp: async () => {
-    Language.setActiveLang(globalVariables.language)
+    Language.setActiveLang(await settings.value("Lang"))
     const questions = [{
       type: "input",
       name: "removeAnyApp",
@@ -122,4 +138,36 @@ module.exports = {
     },];
     return inquirer.prompt(questions);
   },
+  globalMenu: async () => {
+    Language.setActiveLang(await settings.value("Lang"))
+    const questions = [{
+      type: "list",
+      name: "globalSelection",
+      message: await Language.get('main-menu-item-11'),
+      choices: [
+        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();
+      },
+    },];
+    return inquirer.prompt(questions);
+  },
 };

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "miwatchkleaner",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -493,6 +493,11 @@
         "tmp": "^0.0.33"
       }
     },
+    "extract-numbers": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/extract-numbers/-/extract-numbers-1.0.5.tgz",
+      "integrity": "sha512-MWmC/RPYU6qoOnm0tGIAaOdHcQ4DEL1JfODEF6Jpaji13KmB08EbkKRDH5W8gGJlJ6JjzwbDqpXa25WLWOltAQ=="
+    },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -1237,6 +1242,11 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
+    "settings-store": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/settings-store/-/settings-store-1.4.1.tgz",
+      "integrity": "sha512-AJ7EYdaL9TksOStjablB/6EqOJN8ZW97Kp3Vi+YuPDoegRuCJvsbZolxoqHpgSFG2Jc8trQGF+0RPeN5My2G/A=="
+    },
     "shell-exec": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/shell-exec/-/shell-exec-1.0.2.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "miwatchkleaner",
-  "version": "3.1.2",
+  "version": "3.3.1",
   "description": "MiWatch Cleaning Tool",
   "main": "app.js",
   "bin": "app.js",
@@ -10,7 +10,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://kithub.cf/Karl/MiWatchKleaner.git"
+    "url": "https://github.com/karl0ss/MiWatchKleaner.git"
   },
   "author": "Karl Hudgell",
   "license": "ISC",
@@ -21,12 +21,14 @@
     "chalk-rainbow": "^1.0.0",
     "clear": "^0.1.0",
     "clui": "^0.3.6",
+    "extract-numbers": "^1.0.5",
     "figlet": "^1.3.0",
     "get-files-in": "^1.2.0",
     "inquirer": "^7.1.0",
     "node-fetch": "^2.6.0",
     "perfect-logger": "^2.0.1",
     "pkg": "^4.4.7",
+    "settings-store": "^1.4.1",
     "shell-exec": "^1.0.2",
     "shelljs": "^0.8.4"
   },

pages/pages.js

@@ -6,6 +6,8 @@ const logger = require('perfect-logger');
 const Language = require("@shypes/language-translator");
 const globalVariables = require('../lib/globalVars');
 const adb = require('../lib/adb');
+const settings = require("settings-store");
+
 
 logger.info(process.platform + " detected")
 if (process.platform === 'win32' || process.platform === 'win64') {
@@ -25,9 +27,11 @@ module.exports = {
         common.log('main-menu-item-1')
         common.header('main-menu-item-1')
         common.print('remove-xiaomi-apps', 'whiteBright')
-        const removalPackagesList = files.loadPackageList()
+        const removalPackagesList = await common.getXiaomiAppsList()
-        for (let package of removalPackagesList.apps) {
+        for (let package of removalPackagesList) {
-            await adb.removeXiaomiApk(package)
+            if (package.klean === "X" || package.global === "X") {
+                await adb.removeXiaomiApk(package.name)
+            }
         }
         common.print('removal-complete', 'green')
         await common.pause(2000)
@@ -68,8 +72,8 @@ module.exports = {
     removeXiaomiApps: async () => {
         common.header('main-menu-item-2')
         common.log('main-menu-item-2')
-        const value = await inquirer.removeAppsList();
+        const value = await inquirer.xiaomiAppsList();
-        for (let package of value.removeAppsList) {
+        for (let package of value.appList) {
             await adb.removeXiaomiApk(package)
         }
         common.dualLog('removal-complete', 'green')
@@ -80,8 +84,8 @@ module.exports = {
     restoreXiaomiApps: async () => {
         common.header('main-menu-item-3')
         common.log('main-menu-item-3')
-        const value = await inquirer.removeAppsList();
+        const value = await inquirer.xiaomiAppsList();
-        for (let package of value.removeAppsList) {
+        for (let package of value.appList) {
             await adb.restoreXiaomiApk(package)
         }
         common.dualLog('restoring-apps-complete', 'green')
@@ -141,9 +145,9 @@ module.exports = {
         common.header('main-menu-item-7')
         common.log('main-menu-item-7')
 
-        let apkList = await files.getListOfAPk('./my-apk/')
+        let apkList = await files.getListOfAPk('./my_apk/')
         await files.renameLocalApk(apkList)
-        apkList = await files.getListOfAPk('./my-apk/')
+        apkList = await files.getListOfAPk('./my_apk/')
 
         for (let element of apkList) {
             console.log(await Language.get('installing') + ' ' + element)
@@ -172,10 +176,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()
@@ -185,36 +217,88 @@ module.exports = {
     },
 
     selectLanguage: async () => {
-        common.header('Select Language')
+        if (await settings.value("Lang") != undefined) {
-        common.log('Select Language')
+            common.log(await settings.value("Lang") + " Selected")
-        const v = await inquirer.LanguageSelect()
+            module.exports.connectWatch()
-        globalVariables.language = v.selection
+        } else {
-        module.exports.connectWatch()
+            common.header('Select Language')
+            common.log('Select Language')
+            const v = await inquirer.LanguageSelect()
+            settings.setValue("Lang", v.selection)
+        }
+    },
+
+    globalTheme: async () => {
+        const v = await inquirer.globalMenu()
+        console.log(v)
+        if (v.globalSelection === "enable global theme") {
+            common.log('main-menu-item-11')
+            common.header('main-menu-item-11')
+            common.print('enable-global-theme', 'whiteBright')
+            const removalPackagesList = await common.getXiaomiAppsList()
+            for (let package of removalPackagesList) {
+                if (package.global === "X") {
+                    await adb.removeXiaomiApk(package.name)
+                }
+            }
+            common.print('removal-complete', 'green')
+            await common.pause(2000)
+            // common.log('removal-complete')
+            // common.log('compatible-apps')
+            module.exports.mainMenu()
+        } else {
+            common.log('main-menu-item-11')
+            common.header('main-menu-item-11')
+            common.print('disable-global-theme', 'whiteBright')
+            const removalPackagesList = await common.getXiaomiAppsList()
+            for (let package of removalPackagesList) {
+                if (package.global === "X") {
+                    await adb.restoreXiaomiApk(package.name)
+                }
+            }
+            // common.print('removal-complete', 'green')
+            await common.pause(2000)
+            // 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_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_5 = await Language.get('main-menu-item-5')
         menu_6 = await Language.get('main-menu-item-6')
         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')
+        menu_11 = await Language.get('main-menu-item-11')
 
         switch (mainMenuSelection.mainMenu) {
             case menu_1.toLowerCase():
                 module.exports.oneClick()
                 break;
-            case menu_2.toLowerCase():
+            case menu_12.toLowerCase():
-                module.exports.removeXiaomiApps()
+                module.exports.xiaomiApps()
-                break;
-            case menu_3.toLowerCase():
-                module.exports.restoreXiaomiApps()
                 break;
+            // case menu_3.toLowerCase():
+            //     module.exports.restoreXiaomiApps()
+            //     break;
             case menu_4.toLowerCase():
                 module.exports.installCompatibleApps()
                 break;
@@ -230,7 +314,17 @@ 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():
+                process.kill(process.pid)
+                break;
+            case menu_11.toLowerCase():
+                module.exports.globalTheme();
                 break;
             default:
             // code block