From 92793da6798a225039ee594482e3d1ef0dca5680 Mon Sep 17 00:00:00 2001
From: Kenny <27463495+Frontesque@users.noreply.github.com>
Date: Tue, 5 Jul 2022 14:34:47 -0400
Subject: [PATCH] feat: :bookmark: Version 1.5.0

---
 package.json                               |  2 +-
 src/main/mainWindow.js                     |  4 +-
 src/renderer/components/back.vue           |  2 +-
 src/renderer/components/scrcpy.vue         | 32 +++++++++-------
 src/renderer/components/scrcpyPlusInfo.vue | 12 +++++-
 src/renderer/components/tools.vue          |  9 +++--
 src/renderer/layouts/default.vue           |  4 ++
 src/renderer/nuxt.config.js                |  2 +-
 src/renderer/pages/changelog.vue           | 17 +++++++++
 src/renderer/pages/index.vue               | 22 +++++++++--
 src/renderer/pages/settings.vue            | 43 ++++++++++++++++++++++
 src/renderer/pages/tools/apps.vue          |  2 +-
 src/renderer/pages/tools/files.vue         | 38 ++++++++++---------
 src/renderer/pages/tools/resources.vue     |  1 +
 src/renderer/pages/wirelessSetup.vue       |  2 +-
 15 files changed, 146 insertions(+), 46 deletions(-)
 create mode 100644 src/renderer/pages/settings.vue

diff --git a/package.json b/package.json
index 6c790ad..8e2ff23 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scrcpy-plus",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "A GUI for scrcpy",
   "main": "./dist/main/index.js",
   "scripts": {
diff --git a/src/main/mainWindow.js b/src/main/mainWindow.js
index 0502893..63766ab 100644
--- a/src/main/mainWindow.js
+++ b/src/main/mainWindow.js
@@ -2,8 +2,8 @@ import BrowserWinHandler from './BrowserWinHandler'
 
 const winHandler = new BrowserWinHandler({
   height: 700,
-  width: 600,
-  minWidth: 300,
+  width: 720,
+  minWidth: 720,
   autoHideMenuBar: true,
   titleBarStyle: 'hidden',
   titleBarOverlay: {
diff --git a/src/renderer/components/back.vue b/src/renderer/components/back.vue
index b431f61..b53b8a5 100644
--- a/src/renderer/components/back.vue
+++ b/src/renderer/components/back.vue
@@ -1,5 +1,5 @@
 <template>
     <v-btn rounded color="primary" @click="$router.go(-1)" style="margin-right: 1em;">
-        <v-icon>mdi-arrow-left</v-icon>
+        <v-icon style="margin-right: 0;">mdi-arrow-left</v-icon>
     </v-btn>
 </template>
\ No newline at end of file
diff --git a/src/renderer/components/scrcpy.vue b/src/renderer/components/scrcpy.vue
index 270bee9..7737e52 100644
--- a/src/renderer/components/scrcpy.vue
+++ b/src/renderer/components/scrcpy.vue
@@ -1,25 +1,28 @@
 <template>
   <div>
 
-    <section>
+    <section style="margin-top: 0;">
       <h2>SCRCPY Settings</h2>
 
 
       <!--   Standard Actions   -->
       <v-list-item v-for="(item, i) in args" :key="i">
         <div style="display: flex;">
-          <v-checkbox v-model="selectedArgs" :value="item" />
+          
+          <v-checkbox
+            v-model="selectedArgs"
+            :value="item"
+            :label="item.arg.replace(/-/g,' ')"
+            persistent-hint
+            :hint="item.description"
+          />
 
-          <div style="display: block; transform: translateY(25%);">
-            <v-list-item-title v-text="item.arg.replace(/-/g,' ')" />
-            <p v-text="item.description" class="accent--text" />
-          </div>
         </div>
       </v-list-item>
       <!--   End Standard Actions   -->
 
       <!--   Advanced Actions Wrapper   -->
-      <v-expansion-panels>
+      <v-expansion-panels style="margin-top: 1em;">
         <v-expansion-panel class="rounded-xl" style="background-color: rgba(0,0,0, 0.25);">
           <v-expansion-panel-header>Advanced</v-expansion-panel-header>
           <v-expansion-panel-content>
@@ -37,12 +40,15 @@
             <!--   Advanced Actions   -->
             <v-list-item v-for="(item, i) in advArgs" :key="i">
               <div style="display: flex;">
-                <v-checkbox v-model="selectedArgs" :value="item" />
 
-                <div style="display: block; transform: translateY(25%);">
-                  <v-list-item-title v-text="item.arg.replace(/-/g,' ')" />
-                  <p v-text="item.description" class="accent--text" />
-                </div>
+                <v-checkbox
+                  v-model="selectedArgs"
+                  :value="item"
+                  :label="item.arg.replace(/-/g,' ')"
+                  persistent-hint
+                  :hint="item.description"
+                />
+
               </div>
             </v-list-item>
             <!--   End Advanced Actions   -->
@@ -95,7 +101,7 @@ export default {
 
         this.$execute(`scrcpy --bit-rate ${this.bitrate}M`+flags)
           .catch((err) => {
-            if (err.startsWith("INFO:")) return; // Catch information outputs
+            if (typeof err != "object" && err.startsWith("INFO:")) return; // Catch information outputs
             this.dialog = true;
             this.dialogText = err;
           })
diff --git a/src/renderer/components/scrcpyPlusInfo.vue b/src/renderer/components/scrcpyPlusInfo.vue
index 9f4e87f..706fc35 100644
--- a/src/renderer/components/scrcpyPlusInfo.vue
+++ b/src/renderer/components/scrcpyPlusInfo.vue
@@ -5,7 +5,17 @@
         <h1>SCRCPY+ ({{ version }})</h1>
         <h4>SCRCPY ({{ scrcpyVersion }})</h4>
         <h4>ADB ({{ adbVersion }})</h4>
-        <v-btn style="margin-top: 1em;" rounded color="primary" to="/changelog">SCRCPY+ Changelog</v-btn>
+        <v-card-actions>
+          <v-btn rounded color="primary" to="/changelog">
+            <v-icon>mdi-script-text</v-icon>
+            SCRCPY+ Changelog
+          </v-btn>
+          <v-btn rounded to="/settings">
+            <v-icon>mdi-cog</v-icon>
+            Settings
+          </v-btn>
+          
+        </v-card-actions>
         </section>
 
         <!--   Error Dialog   -->
diff --git a/src/renderer/components/tools.vue b/src/renderer/components/tools.vue
index 07fdf9f..dd1e384 100644
--- a/src/renderer/components/tools.vue
+++ b/src/renderer/components/tools.vue
@@ -1,11 +1,11 @@
 <template>
-    <section>
+    <section style="margin-right: 0.5em;">
         <h2>Tools <v-chip color="primary" style="margin-left: 0.5em; height: 2em;">Beta</v-chip></h2>
         <div class="accent--text">All tools are written by me for SCRCPY+. All bug reports should go through the GitHub!</div>
 
         <v-list-item v-for="(item, i) in cmds" :key="i">
             <v-btn rounded :to="item.to" :disabled="item.disabled">
-                <v-icon v-text="item.icon" style="margin-right: 0.5em;"/>
+                <v-icon v-text="item.icon"/>
                 {{ item.title }}
             </v-btn>
         </v-list-item>
@@ -32,10 +32,11 @@ export default {
                 {
                     title: "Resource Monitor",
                     icon: "mdi-chart-bell-curve",
-                    to: "/tools/resources"
+                    to: "/tools/resources",
+                    disabled: true,
                 },
                 {
-                    title: "Partition Dumper (Coming Soon)",
+                    title: "Partition Dumper",
                     icon: "mdi-zip-box",
                     to: "/tools/dump",
                     disabled: true
diff --git a/src/renderer/layouts/default.vue b/src/renderer/layouts/default.vue
index 9c9071b..14549fb 100644
--- a/src/renderer/layouts/default.vue
+++ b/src/renderer/layouts/default.vue
@@ -51,4 +51,8 @@ section {
   background: #999;
   border-radius: 3px;
 }
+
+.v-icon {
+  margin-right: 0.5em;
+}
 </style>
\ No newline at end of file
diff --git a/src/renderer/nuxt.config.js b/src/renderer/nuxt.config.js
index 168940c..81dead5 100644
--- a/src/renderer/nuxt.config.js
+++ b/src/renderer/nuxt.config.js
@@ -7,7 +7,7 @@
 
 module.exports = {
   env: {
-    version: "1.4.1",
+    version: "1.5.0",
     scrcpyPath: "resources/scrcpy/",
 
     releasesUrl: "https://api.github.com/repos/Frontesque/scrcpy-plus/releases",
diff --git a/src/renderer/pages/changelog.vue b/src/renderer/pages/changelog.vue
index 3b1edae..488a442 100644
--- a/src/renderer/pages/changelog.vue
+++ b/src/renderer/pages/changelog.vue
@@ -8,6 +8,23 @@
             </v-card-title>
         </section>
 
+        <section>
+            <h3>1.5.0</h3>
+            <ul>
+                <li>Slight UI Tweaks</li>
+                <li>Disable Resource Monitor tool since it only worked on older samsung devices</li>
+                <li>Move Tools and ADB Quick Commands next to eachother as per the request of reddit/u/aroonz</li>
+                <li>Fix errors not showing on some devices when starting SCRCPY</li>
+                <li>Change how SCRCPY flags are rendered for better performance and style</li>
+                <li>Change how the file manager renders list items</li>
+                <li>Change how icons are rendered</li>
+                <li>Add settings page</li>
+                <li>Add the ability do disable sections of the app in settings</li>
+                <li>Change default window bounds</li>
+                <li>Adjust bounding on wireless connecting success screen</li>
+            </ul>
+        </section>
+
         <section>
             <h3>1.4.1</h3>
             <ul>
diff --git a/src/renderer/pages/index.vue b/src/renderer/pages/index.vue
index 4496291..48b894b 100644
--- a/src/renderer/pages/index.vue
+++ b/src/renderer/pages/index.vue
@@ -2,9 +2,13 @@
   <div style="scrollbar-width: thin;">
     <!--   Import Modules   -->
     <scrcpyPlusInfo />
-    <device :device.sync="deviceConnected" />
-    <tools v-if="deviceConnected" />
-    <adb v-if="deviceConnected" />
+    <device :device.sync="deviceConnected" style="margin-bottom: 0;" v-show="settings.device == 'true' || !deviceConnected" />
+    
+    <div style="display: flex; width: 100%;">
+      <tools v-if="deviceConnected && settings.tools == 'true'" />
+      <adb v-if="deviceConnected && settings.adb == 'true'" />
+    </div>
+
     <scrcpy v-if="deviceConnected" />
 
     <updateNotice />
@@ -19,7 +23,19 @@ export default {
   data() {
     return {
       deviceConnected: false,
+
+      settings: {}
     }
+  },
+
+  mounted() {
+    this.settings = {
+      device: localStorage.getItem("deviceInformation") || true,
+      tools: localStorage.getItem("tools") || true,
+      adb: localStorage.getItem("adbQuickActions") || true,
+    }
+    console.log(this.settings)
   }
+
 }
 </script>
diff --git a/src/renderer/pages/settings.vue b/src/renderer/pages/settings.vue
new file mode 100644
index 0000000..499ef68
--- /dev/null
+++ b/src/renderer/pages/settings.vue
@@ -0,0 +1,43 @@
+<template>
+    <div>
+
+        <section>
+            <v-card-title>
+                <back />
+                Settings
+            </v-card-title>
+        </section>
+
+        <section>
+            <v-switch inset label="Disable Device Information" v-model="deviceInformation" />
+            <v-switch inset label="Disable Tools" v-model="tools" />
+            <v-switch inset label="Disable ADB Quick Actions" v-model="adbQuickActions" />
+        </section>
+
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            deviceInformation: false,
+            tools: false,
+            adbQuickActions: false,
+        }
+    },
+
+    watch: {
+        deviceInformation(newVal) { localStorage.setItem("deviceInformation", !newVal); },
+        tools(newVal) { localStorage.setItem("tools", !newVal); },
+        adbQuickActions(newVal) { localStorage.setItem("adbQuickActions", !newVal); }
+    },
+
+    mounted() {
+        this.deviceInformation = localStorage.getItem("deviceInformation") == 'true' ? false : true;
+        this.tools = localStorage.getItem("tools") == 'true' ? false : true;
+        this.adbQuickActions =  localStorage.getItem("adbQuickActions") == 'true' ? false : true;
+    }
+
+}
+</script>
\ No newline at end of file
diff --git a/src/renderer/pages/tools/apps.vue b/src/renderer/pages/tools/apps.vue
index be79233..4677a7b 100644
--- a/src/renderer/pages/tools/apps.vue
+++ b/src/renderer/pages/tools/apps.vue
@@ -26,7 +26,7 @@
                 
                 
                 <v-list-item-icon>
-                    <v-icon v-text="item.icon || 'mdi-package'" />
+                    <v-icon v-text="item.icon || 'mdi-package'" style="margin-right: 0;"/>
                 </v-list-item-icon>
                 <v-list-item-content>
                     <v-list-item-title>
diff --git a/src/renderer/pages/tools/files.vue b/src/renderer/pages/tools/files.vue
index c617049..554f0ce 100644
--- a/src/renderer/pages/tools/files.vue
+++ b/src/renderer/pages/tools/files.vue
@@ -28,24 +28,26 @@
         <!--   End Empty Notice   -->
 
         <!--   File Selector   -->
-        <v-list-item-group v-model="selected" color="primary" style="margin-top: 12em;">
-            <v-list-item v-for="(item, i) in files" :key="i">
-                
-                
-                <v-list-item-icon>
-                    <v-icon v-text="item.icon || 'mdi-package'" />
-                </v-list-item-icon>
-                <v-list-item-content>
-                    <v-list-item-title>
-                        {{ item.name }}
-                        <v-chip v-if="item.disabled" style="height: 1.75em;">Disabled</v-chip>
-                    </v-list-item-title>
-                </v-list-item-content>
-
-
-
-            </v-list-item>
-        </v-list-item-group>
+        <v-list nav>
+            <v-list-item-group v-model="selected" color="primary" style="margin-top: 12em;">
+                <v-list-item v-for="(item, i) in files" :key="i" nav>
+                    
+                    
+                    <v-list-item-icon>
+                        <v-icon v-text="item.icon || 'mdi-package'" />
+                    </v-list-item-icon>
+                    <v-list-item-content>
+                        <v-list-item-title>
+                            {{ item.name }}
+                            <v-chip v-if="item.disabled" style="height: 1.75em;">Disabled</v-chip>
+                        </v-list-item-title>
+                    </v-list-item-content>
+
+
+
+                </v-list-item>
+            </v-list-item-group>
+        </v-list>
         <!--   End File Selector   -->
 
 
diff --git a/src/renderer/pages/tools/resources.vue b/src/renderer/pages/tools/resources.vue
index 5e7f610..51a1700 100644
--- a/src/renderer/pages/tools/resources.vue
+++ b/src/renderer/pages/tools/resources.vue
@@ -72,6 +72,7 @@ export default {
     methods: {
         async getProcesses() {
             const data = await this.$execute("adb shell top -n 1 -m 1");
+            console.log(data)
 
             this.userUsage = data.split("User ")[1].split("%")[0];
             this.userThreads = data.split("User ")[2].split(" ")[0];
diff --git a/src/renderer/pages/wirelessSetup.vue b/src/renderer/pages/wirelessSetup.vue
index 61ca6de..3db3829 100644
--- a/src/renderer/pages/wirelessSetup.vue
+++ b/src/renderer/pages/wirelessSetup.vue
@@ -52,7 +52,7 @@
             <center>
                 <v-icon size="5em">mdi-cellphone-check</v-icon>
                 <h1>Success!</h1>
-                <v-progress-linear color="primary" indeterminate />
+                <v-progress-linear color="primary" indeterminate style="margin-top: 1em;" />
             </center>
         </section>