Skip to content

Commit

Permalink
refactor: 🔖 Version 1.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Frontesque committed Aug 3, 2022
1 parent 869ef5d commit 3c7a953
Show file tree
Hide file tree
Showing 23 changed files with 33 additions and 76 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "scrcpy-plus",
"version": "1.5.0",
"version": "1.5.1",
"description": "A GUI for scrcpy",
"main": "./dist/main/index.js",
"scripts": {
Expand Down
Binary file modified resources/scrcpy/AdbWinApi.dll
Binary file not shown.
Binary file modified resources/scrcpy/AdbWinUsbApi.dll
Binary file not shown.
Binary file modified resources/scrcpy/SDL2.dll
Binary file not shown.
Binary file modified resources/scrcpy/adb.exe
Binary file not shown.
Binary file modified resources/scrcpy/avcodec-59.dll
Binary file not shown.
Binary file modified resources/scrcpy/avformat-59.dll
Binary file not shown.
Binary file modified resources/scrcpy/avutil-57.dll
Binary file not shown.
Binary file modified resources/scrcpy/msys-usb-1.0.dll
Binary file not shown.
1 change: 1 addition & 0 deletions resources/scrcpy/open_a_terminal_here.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@cmd
Binary file modified resources/scrcpy/scrcpy.exe
Binary file not shown.
Binary file modified resources/scrcpy/swresample-4.dll
Binary file not shown.
Binary file modified resources/scrcpy/swscale-6.dll
Binary file not shown.
8 changes: 7 additions & 1 deletion src/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ import { app } from 'electron'
app.on('window-all-closed', function () {
// On macOS it is common for applications and their menu bar
// to stay active until the user quits explicitly with Cmd + Q
if (process.platform !== 'darwin') app.quit()
if (process.platform !== 'darwin') app.quit();


//--- Kill the ADB server ---//



})

// Load here all startup windows
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/adb.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<section>
<h2>ADB Quick Actions</h2>

<v-list-item v-for="(item, i) in cmds" :key="i">
<v-list-item v-for="(item, i) in cmds" :key="i" style="padding: 0;">
<v-btn rounded v-text="item.title" @click="run(item)" />
</v-list-item>

Expand Down
19 changes: 11 additions & 8 deletions src/renderer/components/device.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@
</center>

<!-- Show Device Information -->
<v-list-item v-for="(item, i) in deviceInfo" :key="i" v-show="device && !loading">
<v-list-item v-for="(item, i) in deviceInfo" :key="i" v-show="device && !loading" style="padding: 0;">
<div>
<v-list-item-title v-text="item.title" />
<v-list-item-title>
<v-icon v-text="item.icon" style="margin-right: 0;" small />
{{item.title}}
</v-list-item-title>
<p v-text="item.data" class="accent--text" />
</div>
</v-list-item>
Expand All @@ -38,33 +41,33 @@
deviceInfo: [{
title: "Model",
icon: "mdi-devices",
command: "adb shell getprop ro.product.model",
data: null,
},
{
title: "Device Codename",
icon: "mdi-cellphone-key",
command: "adb shell getprop ro.product.device",
data: null,
},
{
title: "Android Version",
icon: "mdi-android",
command: "adb shell getprop ro.build.version.release",
data: null,
},
{
title: "Build",
title: "Build Number",
icon: "mdi-wrench",
command: "adb shell getprop ro.build.id",
data: null,
},
{
title: "SDK Version",
icon: "mdi-android-studio",
command: "adb shell getprop ro.build.version.sdk",
data: null,
},
{
title: "Fingerprint",
command: "adb shell getprop ro.build.fingerprint",
data: null,
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/scrcpy.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@


<!-- Advanced Actions -->
<v-list-item v-for="(item, i) in advArgs" :key="i">
<v-list-item v-for="(item, i) in advArgs" :key="i" style="padding: 0;">
<div style="display: flex;">

<v-checkbox
Expand Down
4 changes: 0 additions & 4 deletions src/renderer/components/scrcpyPlusInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
<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>
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/tools.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<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-list-item v-for="(item, i) in cmds" :key="i" style="padding: 0;">
<v-btn rounded :to="item.to" :disabled="item.disabled">
<v-icon v-text="item.icon"/>
{{ item.title }}
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

module.exports = {
env: {
version: "1.5.0",
version: "1.5.1",
scrcpyPath: "resources/scrcpy/",

releasesUrl: "https://api.github.com/repos/Frontesque/scrcpy-plus/releases",
Expand Down
5 changes: 5 additions & 0 deletions src/renderer/pages/changelog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
<li>Clean up some code</li>
<li>Improve app stability</li>
<li>Add "Restart App" button when app fails to start properly</li>
<li>Remove app settings (sorry for feature loss, i hate to do that but the code was so annoying to maintain for something useless imho)</li>
<li>Remove fingerprint from "Device" information section</li>
<li>Add icons to "Device" information section</li>
<li>Improve rendering of "Device", "SCRCPY Settings", "Tools" and "ADB Quick Actions" sections</li>
<li>Change "Build" to "Build Number" under the "Device" section</li>
</ul>
</section>

Expand Down
19 changes: 4 additions & 15 deletions src/renderer/pages/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<div style="scrollbar-width: thin;">
<!-- Import Modules -->
<scrcpyPlusInfo />
<device :device.sync="deviceConnected" style="margin-bottom: 0;" v-show="settings.device || !deviceConnected" />
<device :device.sync="deviceConnected" style="margin-bottom: 0;" />

<div style="display: flex; width: 100%;">
<tools v-if="deviceConnected && settings.tools" />
<adb v-if="deviceConnected && settings.adb" />
<div style="display: flex; width: 100%;" v-if="deviceConnected">
<tools />
<adb />
</div>

<scrcpy v-if="deviceConnected" />
Expand All @@ -23,19 +23,8 @@ export default {
data() {
return {
deviceConnected: false,
settings: {}
}
},
mounted() {
this.settings = {
device: ( localStorage.getItem("deviceInformation") == 'true' ) || true,
tools: ( localStorage.getItem("tools") == 'true' ) || true,
adb: ( localStorage.getItem("adbQuickActions") == 'true' ) || true,
}
console.log(this.settings)
}
}
</script>
43 changes: 0 additions & 43 deletions src/renderer/pages/settings.vue

This file was deleted.

0 comments on commit 3c7a953

Please sign in to comment.