fixed more old buttons, added some feedback changes too

This commit is contained in:
Shane Harris
2022-08-01 14:10:45 +01:00
parent 2b3efca3d2
commit 008d958976
18 changed files with 394 additions and 393 deletions
+44 -57
View File
@@ -163,18 +163,6 @@ export class AdbClientService {
return this.runAdbCommand(
`adb shell monkey -p ${packageName} -c com.oculus.intent.category.VR -c android.intent.category.LAUNCHER -vvv 3`
);
//
// return this.adbCommand('shell', {
// serial: this.deviceSerial,
// command: 'dumpsys package ' + packageName + " | grep -A 1 'filter' | head -n 1 | cut -d ' ' -f 10",
// }).then(res =>
// res
// ? this.adbCommand('shell', {
// serial: this.deviceSerial,
// command: 'am start -n -a com.example.ACTION_NAME ' + res.trim(),
// })
// : Promise.reject('Could not find activity name for ' + packageName)
// );
}
installMultiFile(filepath) {
@@ -1108,52 +1096,51 @@ This can sometimes be caused by changes to your hosts file. Don't make changes u
}
async getPackagePermissions(packagename) {
return this.adbCommand('shell', { serial: this.deviceSerial, command: 'dumpsys package ' + packagename }).then(data => {
let lines = data.split('\n').map(l => l.trim());
let start_needs = lines.indexOf('requested permissions:') + 1;
let end_needs = lines.indexOf('install permissions:');
let start = lines.indexOf('runtime permissions:') + 1;
let end = lines.indexOf('Dexopt state:');
let current = lines
.slice(start_needs, end_needs)
.filter(l => l && l.startsWith('android.permission'))
.map(p => p.split(':')[0].trim());
let installed = lines
.slice(end_needs, start)
.filter(l => l && l.startsWith('android.permission') && l.trim().endsWith('granted=true'))
.map(p => p.split(':')[0].trim());
let read_perm = 'android.permission.READ_EXTERNAL_STORAGE';
let write_perm = 'android.permission.WRITE_EXTERNAL_STORAGE';
let record_perm = 'android.permission.RECORD_AUDIO';
let permsList = [];
if (~current.indexOf(read_perm) && !~installed.indexOf(read_perm)) {
permsList.push(read_perm);
let requested_permissions = await this.runAdbCommand(
`adb shell "dumpsys package ${packagename} | grep permission | sed -n '/runtime permissions/,$p' | grep -v 'runtime'"`
);
let granted_audio = '',
granted_read_storage = '',
granted_write_storage = '';
try {
granted_audio = await this.runAdbCommand(
`adb shell "dumpsys package ${packagename} | grep 'android.permission.RECORD_AUDIO: granted=true'"`
);
} catch {}
try {
granted_write_storage = await this.runAdbCommand(
`adb shell "dumpsys package ${packagename} | grep 'android.permission.WRITE_EXTERNAL_STORAGE: granted=true'"`
);
} catch {}
try {
granted_read_storage = await this.runAdbCommand(
`adb shell "dumpsys package ${packagename} | grep 'android.permission.READ_EXTERNAL_STORAGE: granted=true'"`
);
} catch {}
let read_perm = 'android.permission.READ_EXTERNAL_STORAGE';
let write_perm = 'android.permission.WRITE_EXTERNAL_STORAGE';
let record_perm = 'android.permission.RECORD_AUDIO';
let perms_list = [];
if (requested_permissions.includes(read_perm)) {
perms_list.push(read_perm);
}
if (requested_permissions.includes(write_perm)) {
perms_list.push(write_perm);
}
if (requested_permissions.includes(record_perm)) {
perms_list.push(record_perm);
}
return perms_list.map(d => {
let permission = d.split(':')[0];
let enabled = false;
if (permission.includes(record_perm) && granted_audio.length > 0) {
enabled = true;
} else if (permission.endsWith(write_perm) && granted_write_storage.length > 0) {
enabled = true;
} else if (permission.endsWith(read_perm) && granted_read_storage.length > 0) {
enabled = true;
}
if (~current.indexOf(write_perm) && !~installed.indexOf(write_perm)) {
permsList.push(write_perm);
}
if (~current.indexOf(record_perm) && !~installed.indexOf(record_perm)) {
permsList.push(record_perm);
}
let perms = permsList.map(p => ({ permission: p, enabled: false }));
lines
.slice(start, end)
.filter(l => l && l.startsWith('android.permission'))
.forEach(l => {
let parts = l.split(':');
if (parts.length) {
let perm = parts[0].trim();
let index = permsList.indexOf(perm);
if (~index) {
perms[index].enabled = parts.length > 1 && parts[1].trim() === 'granted=true';
}
}
});
return perms;
return { permission, enabled };
});
}
async getFreeSpace() {
@@ -1,6 +1,6 @@
<div class="right-side-diagnostics" *ngIf="adb.diagnostics">
<h3 i18n>Connection Status</h3>
<h4 i18n>Connection Status</h4>
<div i18n>
<div class="status-circle" [ngClass]="{'green': adb.diagnostics.usb && adb.diagnostics.usb.is_connected}"></div>
<span class="status-text">{{adb.diagnostics.usb && adb.diagnostics.usb.is_connected?'Quest Detected':'Quest Not Detected'}}</span>
@@ -46,7 +46,7 @@
.status-text{
font-size: 12px;
font-size: 16px;
display: inline-block;
margin-left: 5px;
vertical-align: middle;
+2 -1
View File
@@ -65,6 +65,7 @@ export class ElectronService {
async installFromToken(token) {
let res = await this.adbService.adbCommand('installFromToken', { token });
console.log(res);
res.forEach((l, i) => {
switch (l.type) {
case 'Mod':
@@ -126,7 +127,7 @@ export class ElectronService {
switch (url[0]) {
case 'sidequest://w/':
this.adbService.runAdbCommand('adb shell am start -a android.intent.action.VIEW -d ' + url[1]).then(() => {
this.statusService.showStatus('Launching WebXR in browser...');
this.statusService.showStatus('Launching WebXR in browser...', false, true);
});
this.webviewService.isWebviewLoading = false;
break;
+13 -13
View File
@@ -95,8 +95,8 @@
</div>
</mz-modal-content>
<mz-modal-footer>
<button mz-button [flat]="true" mz-modal-close>Close</button>
<button mz-button class="pink-button" mz-modal-close (click)="makeFolder(true)">Make Folder</button>
<div class="pure-material-button-contained spaced flat active" (click)="mkDirModal.closeModal()">Close</div>
<div class="pure-material-button-contained spaced " (click)="makeFolder(true); mkDirModal.closeModal()">Make Folder</div>
</mz-modal-footer>
</mz-modal>
@@ -117,16 +117,16 @@
</div>
</div>
<br><br>
<button mz-button class="pink-button" (click)="pickLocation()">Select Location</button><br><br>
<div class="pure-material-button-contained" (click)="pickLocation()">Select Location</div>
<br><br>
Current Location: {{adbService.savePath}}
</mz-modal-content>
<mz-modal-footer>
<button mz-button [flat]="true" mz-modal-close>Close</button>
<button mz-button class="pink-button" mz-modal-close
(click)="saveFiles(filesToBeSaved); clearSelection(filesToBeSaved)">Save To PC</button>
</mz-modal-footer>
<div class="pure-material-button-contained spaced flat active" (click)="filesModal.closeModal()">Close</div>
<div class="pure-material-button-contained spaced" (click)="mkDirModal.closeModal(); saveFiles(filesToBeSaved); clearSelection(filesToBeSaved)">Save To PC</div>
</mz-modal-footer>
</mz-modal>
<mz-modal #downloadMediaModal [fixedFooter]="true">
@@ -135,14 +135,14 @@
</mz-modal-header>
<mz-modal-content>
Pick a location on your PC to save screenshots and recordings:<br><br>
<button mz-button class="pink-button" (click)="pickLocation()">Select Location</button><br><br>
<div class="pure-material-button-contained spaced" (click)="pickLocation()">Select Location</div><br><br>
Current Location: {{adbService.savePath}}
</mz-modal-content>
<mz-modal-footer>
<button mz-button [flat]="true" mz-modal-close>Close</button>
<button mz-button class="pink-button" mz-modal-close (click)="downloadMedia()">Save To PC</button>
<div class="pure-material-button-contained spaced flat active" (click)="downloadMediaModal.closeModal()">Close</div>
<div class="pure-material-button-contained spaced flat active" (click)="downloadMediaModal.closeModal(); downloadMedia()">Save To PC</div>
</mz-modal-footer>
</mz-modal>
@@ -168,8 +168,8 @@
WARNING: This cannot be undone!!
</mz-modal-content>
<mz-modal-footer>
<button mz-button [flat]="true" mz-modal-close>Close</button>
<button mz-button class="red" mz-modal-close
(click)="deleteFiles(filesToBeDeleted); clearSelection(filesToBeDeleted)">Delete Items</button>
<div class="pure-material-button-contained spaced flat active" (click)="confirmModal.closeModal()">Close</div>
<div class="pure-material-button-contained spaced red" (click)="confirmModal.closeModal();deleteFiles(filesToBeDeleted); clearSelection(filesToBeDeleted)">Delete Items</div>
</mz-modal-footer>
</mz-modal>
@@ -185,26 +185,27 @@
</mz-modal-content>
<mz-modal-footer>
<button mz-button [flat]="true" mz-modal-close routerLink="/webview" (click)="webService.loadUrl(webUrl || 'https://sidequestvr.com');" >SideQuest Home</button>
<button mz-button [flat]="true" mz-modal-close>Close</button>
<div class="pure-material-button-contained spaced flat active" (click)="bookmarksModal.closeModal()">Close</div>
<div class="pure-material-button-contained spaced" routerLink="/webview" (click)="bookmarksModal.closeModal(); webService.loadUrl(webUrl || 'https://sidequestvr.com');" >SideQuest Home</div>
</mz-modal-footer>
</mz-modal>
<mz-modal #logcatModal [fixedFooter]="true" [options]="{dismissible: false}">
<mz-modal-header>
<button mz-button class="right red" mz-modal-close (click)="stopLogcat(); currentLogCat.length = 0; isStarted = false;">Close</button>
<button mz-button class="right red margin-right" (click)="stopLogcat(); isStarted = false;">Stop</button>
<button mz-button class="right margin-right" *ngIf="!saveLogcatPath" (click)="selectLogcatOutput();">Pick Output Folder</button>
<button mz-button class="right red margin-right" *ngIf="saveLogcatPath" (click)="cancelLogcatOutput();">Cancel Output</button>
<h4>ADB Logcat</h4>
<div class="pure-material-button-contained spaced red" (click)="logcatModal.closeModal();stopLogcat(); currentLogCat.length = 0; isStarted = false;">Close</div>
<div class="pure-material-button-contained spaced red" (click)="stopLogcat(); isStarted = false;">Stop</div>
<div class="pure-material-button-contained spaced" *ngIf="!saveLogcatPath" (click)="selectLogcatOutput();">Pick Output Folder</div>
<div class="pure-material-button-contained spaced red" *ngIf="saveLogcatPath" (click)="cancelLogcatOutput(); isStarted = false;">Cancel Output</div>
<h4>ADB Logcat</h4>
</mz-modal-header>
<mz-modal-content>
Select your options and click start to begin receiving logcat messages.
<div class="truncate">{{saveLogcatPath ? 'Saving to: ' + appService.path.join(saveLogcatPath,'logcat.log') : ''}}
<div class="pure-material-button-contained spaced red" *ngIf="saveLogcatPath" (click)="clearLogcatFile();">Clear File</div>
<button mz-button class="red small-button margin-left" *ngIf="saveLogcatPath" (click)="clearLogcatFile();">Clear File</button>
</div>
</div>
<br>
<div class="button-section">
<div class="code logcat-block">
@@ -245,8 +246,8 @@
</select>
</div>
<div class="col s3">
<button mz-button class="green" (click)="startLogcat(); isStarted = true;">{{isStarted?'Restart':'Start'}}</button>
</div>
<div class="pure-material-button-contained" (click)="startLogcat(); isStarted = true;">{{isStarted?'Restart':'Start'}}</div>
</div>
</div>
</mz-modal-footer>
</mz-modal>
@@ -275,7 +276,7 @@
Thank you and have a great day!
</mz-modal-content>
<mz-modal-footer>
<button mz-button class="pink-button" mz-modal-close>Back to Safety</button>
<div class="pure-material-button-contained" (click)="safeModal.closeModal(); ">Back to Safety</div>
</mz-modal-footer>
</mz-modal>
@@ -303,30 +304,17 @@
<br><br>
</mz-modal-content>
<mz-modal-footer>
<button mz-button [flat]="true" mz-modal-close>Close</button>
<button mz-button class="pink-button" (click)="runAdbCommand()">Run Command</button>
</mz-modal-footer>
</mz-modal>
<mz-modal #closeAppModal [fixedFooter]="true">
<mz-modal-header>
<h4>Close SideQuest</h4>
</mz-modal-header>
<mz-modal-content>
Are you sure you want to close SideQuest? This will cancel any running tasks.
</mz-modal-content>
<mz-modal-footer>
<button mz-button [flat]="true" mz-modal-close>Cancel</button>
<button mz-button class="pink-button" mz-modal-close (click)="closeApp()">Exit SideQuest Now</button>
</mz-modal-footer>
<div class="pure-material-button-contained flat active spaced" (click)="adbModal.closeModal(); ">Close</div>
<div class="pure-material-button-contained" (click)="runAdbCommand()">Run Command</div>
</mz-modal-footer>
</mz-modal>
<mz-modal #manageFavs [fixedFooter]="true">
<mz-modal-header>
<button mz-button class="right pink-button" (click)="showAddFavourite = !showAddFavourite">{{showAddFavourite? 'Hide' : 'Add New'}}</button>
<button mz-button class="right pink-button margin-right" *ngIf="!showAddFavourite" (click)="addCurrentFavourite()"><i class="material-icons left">add</i>Add Current to favs</button>
<h4>Manage Favourites</h4>
<div class="pure-material-button-contained spaced" (click)="showAddFavourite = !showAddFavourite">{{showAddFavourite? 'Hide' : 'Add New'}}</div>
<div class="pure-material-button-contained spaced" *ngIf="!showAddFavourite" (click)="addCurrentFavourite()"><i class="material-icons left">add</i>Add Current to favs</div>
<h4>Manage Favourites</h4>
</mz-modal-header>
<mz-modal-content>
Manage your favourites here. If you need to undo click RESET at the bottom. When you are done click SAVE.<br><br>
@@ -357,9 +345,12 @@
<div dragula="SONGS" [(dragulaModel)]="this.favourites[favoriteType]" >
<div class="row fav-padding relative" *ngFor="let fav of this.favourites[favoriteType]; let i = index">
<i class="material-icons drag-indicator grey-text">drag_indicator</i>
<div class="col s4"><input type="text" [(ngModel)]="fav.name"/></div>
<div class="col s4"><input type="text" [(ngModel)]="fav.uri"/></div>
<div class="col s4"><input type="text" [(ngModel)]="fav.icon"/></div>
<div class="col s3 m4"><input type="text" [(ngModel)]="fav.name"/></div>
<div class="col s3"><input type="text" [(ngModel)]="fav.uri"/></div>
<div class="col s3"><input type="text" [(ngModel)]="fav.icon"/></div>
<div class="col s3 center-align m2">
<div class="pure-material-button-contained" (click)="setLocalIcon(fav)">Pick Icon</div>
</div>
<i class="material-icons delete-button orange-text" (click)="removeFromFavourites(favoriteType, i)">close</i>
</div>
</div>
@@ -367,7 +358,7 @@
</mz-modal-content>
<mz-modal-footer>
<button mz-button [flat]="true" mz-modal-close (click)="resetFavourites(favoriteType); showAddFavourite = false;">Cancel</button>
<button mz-button class="pink-button" mz-modal-close (click)="saveFavourites(favoriteType); showAddFavourite = false;">Save</button>
</mz-modal-footer>
<div class="pure-material-button-contained flat active spaced" (click)="resetFavourites(favoriteType); showAddFavourite = false;manageFavs.closeModal()">Cancel</div>
<div class="pure-material-button-contained spaced" (click)="saveFavourites(favoriteType); showAddFavourite = false;manageFavs.closeModal()">Cancel</div>
</mz-modal-footer>
</mz-modal>
+10 -1
View File
@@ -179,7 +179,16 @@ export class HeaderComponent implements OnInit {
saveFavourites(type: string) {
localStorage.setItem(type, JSON.stringify(this.favourites[type]));
}
async setLocalIcon(fav: FavouriteItem) {
const res = await this.appService.remote.dialog.showOpenDialog({
filters: [{ name: 'Pictures', extensions: ['png', 'jpg', 'jpeg'] }],
properties: ['openFile'],
defaultPath: this.appService.backupPath,
});
if (res && res.filePaths && res.filePaths.length === 1) {
fav.icon = res.filePaths[0];
}
}
ngOnInit() {}
runAdbCommand() {
return this.adbService.runAdbCommand(this.adbCommandToRun).catch(e => {
@@ -11,6 +11,7 @@
<h4 class="section-title">Quality & Performance</h4>
<div class="section-container card z-depth-2">
<h5 class="section-title">Set CPU and GPU level</h5>
<div class="divider header-divider-margin margin-bottom"></div>
<h4 class="description-section">
This can improve performance for apps & games at the expense of quicker battery draining and your device may get a little hotter than normal but totally within limits.
</h4>
@@ -33,76 +34,73 @@
</label>
</p>
<h5 class="section-title">Default Texture Size</h5>
<div class="divider header-divider-margin margin-bottom"></div>
<div class="description-section">
This will change how high quality some of the in game textures are rendered at.
</div>
<div class="inline margin-right">
<p>
<label>
<input name="textureSize" type="radio" value="1216-1344" [(ngModel)]="textureSize" (click)="setSSO(SSO._Quest1)"/>
<span>Default - Quest 1</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="1440-1584" [(ngModel)]="textureSize" (click)="setSSO(SSO._Quest2)"/>
<span>Default - Quest 2</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="512-563" [(ngModel)]="textureSize" (click)="setSSO(SSO._512)"/>
<span>512</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="768-845" [(ngModel)]="textureSize" (click)="setSSO(SSO._768)"/>
<span>768</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="1024-1127" [(ngModel)]="textureSize" (click)="setSSO(SSO._1024)"/>
<span>1024</span>
</label>
</p>
</div>
<div class="inline">
<p>
<label>
<input name="textureSize" type="radio" value="1280-1408" [(ngModel)]="textureSize" (click)="setSSO(SSO._1280)"/>
<span>1280</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="1536-1690" [(ngModel)]="textureSize" (click)="setSSO(SSO._1536)"/>
<span>1536</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="2048-2253" [(ngModel)]="textureSize" (click)="setSSO(SSO._2048)"/>
<span>2048</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="2560-2816" [(ngModel)]="textureSize" (click)="setSSO(SSO._2560)"/>
<span>2560</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="3072-3380" [(ngModel)]="textureSize" (click)="setSSO(SSO._3072)"/>
<span>3072</span>
</label>
</p>
</div>
<p>
<label>
<input name="textureSize" type="radio" value="1216-1344" [(ngModel)]="textureSize" (click)="setSSO(SSO._Quest1)"/>
<span>Default - Quest 1</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="1440-1584" [(ngModel)]="textureSize" (click)="setSSO(SSO._Quest2)"/>
<span>Default - Quest 2</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="512-563" [(ngModel)]="textureSize" (click)="setSSO(SSO._512)"/>
<span>512</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="768-845" [(ngModel)]="textureSize" (click)="setSSO(SSO._768)"/>
<span>768</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="1024-1127" [(ngModel)]="textureSize" (click)="setSSO(SSO._1024)"/>
<span>1024</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="1280-1408" [(ngModel)]="textureSize" (click)="setSSO(SSO._1280)"/>
<span>1280</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="1536-1690" [(ngModel)]="textureSize" (click)="setSSO(SSO._1536)"/>
<span>1536</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="2048-2253" [(ngModel)]="textureSize" (click)="setSSO(SSO._2048)"/>
<span>2048</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="2560-2816" [(ngModel)]="textureSize" (click)="setSSO(SSO._2560)"/>
<span>2560</span>
</label>
</p>
<p>
<label>
<input name="textureSize" type="radio" value="3072-3380" [(ngModel)]="textureSize" (click)="setSSO(SSO._3072)"/>
<span>3072</span>
</label>
</p>
<h5 class="section-title">Refresh Rate</h5>
<div class="divider header-divider-margin margin-bottom"></div>
<h4 class="description-section">This will allow you to change to 90Hz refresh rate for 90fps support in games on Quest 2.</h4>
<p>
<label>
@@ -132,6 +130,7 @@
<h5 class="section-title">
Set FFR ( Fixed Foveated Rendering ) level
</h5>
<div class="divider header-divider-margin margin-bottom"></div>
<h4 class="description-section">
This will change how the view is rendered in the outer edges of the viewscreen for each eye. Higher is better
@@ -169,6 +168,7 @@
</label>
</p>
<h5 class="section-title">Chromatic Aberration</h5>
<div class="divider header-divider-margin margin-bottom"></div>
<h4 class="description-section">
This will enable/disable chromatic aberration.
</h4>
@@ -196,124 +196,129 @@
<div class="section-container card z-depth-2">
<h5 class="section-title">Tetiana's Presets</h5>
<h5 class="section-title">Tetiana's Presets</h5>
<h4 class="description-section">
Quickly set the video capture resolution while also using 60 FPS and 10Mbps bitrate capture settings too.
</h4>
<div class="button-section">
<div class="pure-material-button-contained spaced flat active" (click)="setTetianasPreset(TP._FHD)">Full HD ( 1920 x 1080 )</div>
<div class="pure-material-button-contained spaced flat active" (click)="setTetianasPreset(TP._SQUARE)">Square ( 1600 x 1600 )</div>
</div>
<div class="divider header-divider-margin margin-bottom"></div>
<h4 class="description-section">
Quickly set the video capture resolution while also using 60 FPS and 10Mbps bitrate capture settings too.
</h4>
<div class="button-section">
<div class="pure-material-button-contained spaced flat active" (click)="setTetianasPreset(TP._FHD)">Full HD ( 1920 x 1080 )</div>
<div class="pure-material-button-contained spaced flat active" (click)="setTetianasPreset(TP._SQUARE)">Square ( 1600 x 1600 )</div>
</div>
<h5 class="section-title">Video Capture Size</h5>
<h5 class="section-title">Video Capture Size</h5>
<h4 class="description-section">
This changes the resolution of captured videos on the Quest
</h4>
<p>
<label>
<input name="videoCaptureSize" type="radio" value="640-480" [(ngModel)]="videoCaptureSize" (click)="setCR(CR._480)"/>
<span>640 x 480</span>
</label>
</p>
<p>
<label>
<input name="videoCaptureSize" type="radio" value="1280-720" [(ngModel)]="videoCaptureSize" (click)="setCR(CR._720)"/>
<span>1280 x 720</span>
</label>
</p>
<p>
<label>
<input name="videoCaptureSize" type="radio" value="1920-1080" [(ngModel)]="videoCaptureSize" (click)="setCR(CR._1080)"/>
<span>1920 x 1080</span>
</label>
</p>
<p>
<label>
<input name="videoCaptureSize" type="radio" value="1024-1024" [(ngModel)]="videoCaptureSize" (click)="setCR(CR._1024)"/>
<span>1024 X 1024 ( Default )</span>
</label>
</p>
<p>
<label>
<input name="videoCaptureSize" type="radio" value="1600-1600" [(ngModel)]="videoCaptureSize" (click)="setCR(CR._1600)"/>
<span>1600 X 1600</span>
</label>
</p>
<div class="divider header-divider-margin margin-bottom"></div>
<h4 class="description-section">
This changes the resolution of captured videos on the Quest
</h4>
<p>
<label>
<input name="videoCaptureSize" type="radio" value="640-480" [(ngModel)]="videoCaptureSize" (click)="setCR(CR._480)"/>
<span>640 x 480</span>
</label>
</p>
<p>
<label>
<input name="videoCaptureSize" type="radio" value="1280-720" [(ngModel)]="videoCaptureSize" (click)="setCR(CR._720)"/>
<span>1280 x 720</span>
</label>
</p>
<p>
<label>
<input name="videoCaptureSize" type="radio" value="1920-1080" [(ngModel)]="videoCaptureSize" (click)="setCR(CR._1080)"/>
<span>1920 x 1080</span>
</label>
</p>
<p>
<label>
<input name="videoCaptureSize" type="radio" value="1024-1024" [(ngModel)]="videoCaptureSize" (click)="setCR(CR._1024)"/>
<span>1024 X 1024 ( Default )</span>
</label>
</p>
<p>
<label>
<input name="videoCaptureSize" type="radio" value="1600-1600" [(ngModel)]="videoCaptureSize" (click)="setCR(CR._1600)"/>
<span>1600 X 1600</span>
</label>
</p>
<!-- <h5 class="section-title">Full Rate Capture</h5>-->
<!-- <h4 class="description-section">-->
<!-- This will enable/disable the full rate capture for videos recorded i.e. 60/72fps rather than 30fps.-->
<!-- </h4>-->
<!-- <div class="switch">-->
<!-- <label>-->
<!-- Off-->
<!-- <input type="checkbox" class="disable-reviews" [checked]="fullRateCaptureEnabled" (click)="fullRateCaptureEnabled ? setFullRate(GU.OFF) : setFullRate(GU.ON)">-->
<!-- <span class="lever disable-reviews-switch"></span>-->
<!-- On-->
<!-- </label>-->
<!-- </div>-->
<!-- <h5 class="section-title">Full Rate Capture</h5>-->
<!-- <h4 class="description-section">-->
<!-- This will enable/disable the full rate capture for videos recorded i.e. 60/72fps rather than 30fps.-->
<!-- </h4>-->
<!-- <div class="switch">-->
<!-- <label>-->
<!-- Off-->
<!-- <input type="checkbox" class="disable-reviews" [checked]="fullRateCaptureEnabled" (click)="fullRateCaptureEnabled ? setFullRate(GU.OFF) : setFullRate(GU.ON)">-->
<!-- <span class="lever disable-reviews-switch"></span>-->
<!-- On-->
<!-- </label>-->
<!-- </div>-->
<h5 class="section-title">Video Capture FPS</h5>
<h5 class="section-title">Video Capture FPS</h5>
<h4 class="description-section">
This changes the frame rate of captured videos on the Quest
</h4>
<p>
<label>
<input name="captureFps" type="radio" value="24" [(ngModel)]="captureFps" (click)="setCaptureFPSRate(FPS._24)"/>
<span>24fps</span>
</label>
</p>
<p>
<label>
<input name="captureFps" type="radio" value="30" [(ngModel)]="captureFps" (click)="setCaptureFPSRate(FPS._30)"/>
<span>30fps</span>
</label>
</p>
<p>
<label>
<input name="captureFps" type="radio" value="60" [(ngModel)]="captureFps" (click)="setCaptureFPSRate(FPS._60)"/>
<span>60fps</span>
</label>
</p>
<div class="divider header-divider-margin margin-bottom"></div>
<h4 class="description-section">
This changes the frame rate of captured videos on the Quest
</h4>
<p>
<label>
<input name="captureFps" type="radio" value="24" [(ngModel)]="captureFps" (click)="setCaptureFPSRate(FPS._24)"/>
<span>24fps</span>
</label>
</p>
<p>
<label>
<input name="captureFps" type="radio" value="30" [(ngModel)]="captureFps" (click)="setCaptureFPSRate(FPS._30)"/>
<span>30fps</span>
</label>
</p>
<p>
<label>
<input name="captureFps" type="radio" value="60" [(ngModel)]="captureFps" (click)="setCaptureFPSRate(FPS._60)"/>
<span>60fps</span>
</label>
</p>
<h5 class="section-title">Video Capture Bitrate</h5>
<h5 class="section-title">Video Capture Bitrate</h5>
<h4 class="description-section">
This changes the quality of captured videos on the Quest
</h4>
<p>
<label>
<input name="captureBitrate" type="radio" value="5000000" [(ngModel)]="captureBitrate" (click)="setCaptureBitrate(BR._5K)"/>
<span>5mbps</span>
</label>
</p>
<p>
<label>
<input name="captureBitrate" type="radio" value="10000000" [(ngModel)]="captureBitrate" (click)="setCaptureBitrate(BR._10K)"/>
<span>10mbps</span>
</label>
</p>
<p>
<label>
<input name="captureBitrate" type="radio" value="15000000" [(ngModel)]="captureBitrate" (click)="setCaptureBitrate(BR._15K)"/>
<span>15mbps</span>
</label>
</p>
<p>
<label>
<input name="captureBitrate" type="radio" value="20000000" [(ngModel)]="captureBitrate" (click)="setCaptureBitrate(BR._20K)"/>
<span>20mbps</span>
</label>
</p>
<div class="divider header-divider-margin margin-bottom"></div>
<h4 class="description-section">
This changes the quality of captured videos on the Quest
</h4>
<p>
<label>
<input name="captureBitrate" type="radio" value="5000000" [(ngModel)]="captureBitrate" (click)="setCaptureBitrate(BR._5K)"/>
<span>5mbps</span>
</label>
</p>
<p>
<label>
<input name="captureBitrate" type="radio" value="10000000" [(ngModel)]="captureBitrate" (click)="setCaptureBitrate(BR._10K)"/>
<span>10mbps</span>
</label>
</p>
<p>
<label>
<input name="captureBitrate" type="radio" value="15000000" [(ngModel)]="captureBitrate" (click)="setCaptureBitrate(BR._15K)"/>
<span>15mbps</span>
</label>
</p>
<p>
<label>
<input name="captureBitrate" type="radio" value="20000000" [(ngModel)]="captureBitrate" (click)="setCaptureBitrate(BR._20K)"/>
<span>20mbps</span>
</label>
</p>
</div>
<h4 class="section-title">Experimental & Miscellaneous </h4>
<div class="section-container card z-depth-2">
<h5 class="section-title">Experimental Mode</h5>
<div class="divider header-divider-margin margin-bottom"></div>
<h4 class="description-section">
This enables experimental features in your Oculus Quest such as Passthrough API support ( requires guardian to be enabled ).
</h4>
@@ -327,6 +332,7 @@
</label>
</div>
<h5 class="section-title">MTP ( Media Transfer Protocol )</h5>
<div class="divider header-divider-margin margin-bottom"></div>
<h4 class="description-section">
This allows you to transfer files between your computer and your headset using your favourite file explorer. You may need to re-enable this when you re-connect your headset.
</h4>
@@ -340,15 +346,17 @@
</div>
<h5 class="section-title">Proximity Sensor</h5>
<div class="divider header-divider-margin margin-bottom"></div>
<h4 class="description-section">
This disables the proximity sensor effectively keeping your quest awake when not on your head ( requires restart to re-enable ).
This disables the proximity sensor effectively keeping your quest awake.
</h4>
<div class="button-section">
<div class="pure-material-button-contained spaced flat active" (click)="disableProximity()">Disable Proximity Sensor</div>
<div class="pure-material-button-contained spaced flat active" (click)="disableProximity(true)">Enable Proximity Sensor</div>
<div class="pure-material-button-contained spaced flat active" (click)="disableProximity(false)">Disable Proximity Sensor</div>
</div>
<h5 class="section-title">Guardian</h5>
<div class="divider header-divider-margin margin-bottom"></div>
<h4 class="description-section">
This will enable/disable the guardian.
</h4>
@@ -368,6 +376,7 @@
<div class="section-container card z-depth-2">
<h5 class="section-title">SideQuest Folders</h5>
<div class="divider header-divider-margin margin-bottom"></div>
<h4 class="description-section">
This changes the resolution of captured videos on the Quest
</h4>
@@ -379,7 +388,7 @@
</div>
<h5 class="section-title">SideQuest Debugger</h5>
<div class="divider header-divider-margin margin-bottom"></div>
<h4 class="description-section">
Open the SideQuest chromium dev tools.
</h4>
@@ -18,3 +18,6 @@
//border-radius: 5px;
background: #1a1d3c;
}
.header-divider-margin{
margin-top: 1em;
}
@@ -192,8 +192,8 @@ export class HeadsetSettingsComponent implements OnInit {
})
.catch(e => this.statusService.showStatus(e, true));
}
disableProximity() {
this.runAdbCommand('am broadcast -a com.oculus.vrpowermanager.prox_close')
disableProximity(shouldEnable) {
this.runAdbCommand('am broadcast -a com.oculus.vrpowermanager.' + (shouldEnable ? 'automation_disable' : 'prox_close'))
.then(() => {
this.statusService.showStatus('Disable proximity message sent OK!!');
})
@@ -55,87 +55,88 @@
<h4>App Settings</h4>
</mz-modal-header>
<mz-modal-content>
<div *ngIf="isLoadingApp" class="loader-tiny"></div>
<ng-container *ngIf="!isLoadingApp">
<br>
<div class="row no-margin">
<div class="col s7">
<div class="row no-margin">
<div class="col s7">
<span class="chip">
<img *ngIf="currentPackage.package.icon" [src]="currentPackage.package.icon">
{{currentPackage.package.name?currentPackage.package.name:currentPackage.package.packageName}}
</span><br>
<div *ngIf="currentPackage.package.name" class="small-text">{{currentPackage.package.packageName}}</div>
<div *ngIf="currentPackage.versionCode" class="small-text">Version: {{currentPackage.versionCode}}</div><br><br>
<div *ngIf="currentPackage.package.name" class="small-text">{{currentPackage.package.packageName}}</div>
<div *ngIf="currentPackage.versionCode" class="small-text">Version: {{currentPackage.versionCode}}</div><br><br>
<h4>Game Data Backups</h4>
Backup data files from your SD Card for this app/game. This will attempt to save game data and OBB files for the game from the SD Card and not the internal storage. Does not work for all games.<br><br>
<div class="pure-material-button-contained backup-this-package"
(click)="backupData(currentPackage.package.packageName)">Backup Game Data</div><br><br>
<div class="row" *ngFor="let backup of dataBackups">
<div class="col s3">
<div class="chip cursor restore-backup tooltipped" data-position="right" data-tooltip="Restore this backup"
(click)="restoreBackup(showBackupFileName(backup))">
<i class="material-icons">sync</i>
<h4>Game Data Backups</h4>
Backup data files from your SD Card for this app/game. This will attempt to save game data and OBB files for the game from the SD Card and not the internal storage. Does not work for all games.<br><br>
<div class="pure-material-button-contained backup-this-package"
(click)="backupData(currentPackage.package.packageName)">Backup Game Data</div><br><br>
<div class="row" *ngFor="let backup of dataBackups">
<div class="col s3">
<div class="chip cursor restore-backup tooltipped" data-position="right" data-tooltip="Restore this backup"
(click)="restoreBackup(showBackupFileName(backup))">
<i class="material-icons">sync</i>
</div>
</div>
<div class="col s9">
<div class="">
<span class="backup-name">{{showBackupFileName(backup)}}</span>
</div>
</div>
</div>
<div class="col s9">
<div class="">
<span class="backup-name">{{showBackupFileName(backup)}}</span>
<br><br>
<h4>APK Backups</h4>
Backup your APK file from your device.<br><br>
<a class="pure-material-button-contained margin-right"
(click)="backupApk(currentPackage.package.packageName)">Backup APK File</a><br><br>
<div class="row" *ngFor="let backup of backups">
<div class="col s3">
<div class="chip cursor restore-backup tooltipped" data-position="right" data-tooltip="Restore this backup"
(click)="installBackupApk(backup)">
<i class="material-icons">sync</i>
</div>
</div>
<div class="col s9">
<div class="">
<span class="backup-name">{{showBackupFileName(backup)}}</span>
</div>
</div>
</div>
<br><br>
</div>
<br><br>
<h4>APK Backups</h4>
Backup your APK file from your device.<br><br>
<a class="pure-material-button-contained margin-right"
(click)="backupApk(currentPackage.package.packageName)">Backup APK File</a><br><br>
<div class="row" *ngFor="let backup of backups">
<div class="col s3">
<div class="chip cursor restore-backup tooltipped" data-position="right" data-tooltip="Restore this backup"
(click)="installBackupApk(backup)">
<i class="material-icons">sync</i>
<div class="col s5">
<h4>Manage App</h4>
<a class="pure-material-button-contained" (click)="launchApp()">Launch App</a><br><br>
<a class="pure-material-button-contained flat active " (click)="forceClose()">Force Close App</a><br><br>
<a class="pure-material-button-contained flat active " (click)="clearData()">Clear App Data</a><br><br>
<a class="pure-material-button-contained flat active " (click)="uninstallApk()">Uninstall App</a><br><br>
<a class="pure-material-button-contained flat active"
(click)="appService.openFolder(folder.APP_BACKUP,currentPackage.package.packageName)">Open Backups</a>
<br><br><br><br>
<h4>Permissions</h4>
<div>{{perms && !perms.length ? 'No permissions for this app...' : 'Manage permissions for this app.'}}</div>
<br>
<div class="row no-margin" *ngFor="let perm of perms">
<div class="col s8 small-text">
{{perm.display_permission}}
</div>
</div>
<div class="col s9">
<div class="">
<span class="backup-name">{{showBackupFileName(backup)}}</span>
</div>
</div>
</div>
<br><br>
</div>
<div class="col s5">
<h4>Manage App</h4>
<a class="pure-material-button-contained" (click)="launchApp()">Launch App</a><br><br>
<a class="pure-material-button-contained flat active " (click)="forceClose()">Force Close App</a><br><br>
<a class="pure-material-button-contained flat active " (click)="clearData()">Clear App Data</a><br><br>
<a class="pure-material-button-contained flat active " (click)="uninstallApk()">Uninstall App</a><br><br>
<a class="pure-material-button-contained flat active"
(click)="appService.openFolder(folder.APP_BACKUP,currentPackage.package.packageName)">Open Backups</a>
<br><br><br><br>
<h4>Permissions</h4>
<div>{{perms && !perms.length ? 'No permissions for this app...' : 'Manage permissions for this app.'}}</div>
<br>
<div class="row no-margin" *ngFor="let perm of perms">
<div class="col s8 small-text">
{{perm.display_permission}}
</div>
<div class="col s4">
<div class="switch move-up">
<label>
<input type="checkbox" [(ngModel)]="perm.enabled" (change)="setPerm(perm)" />
<span class="lever"></span>
</label>
<div class="col s4">
<div class="switch move-up">
<label>
<input type="checkbox" [(ngModel)]="perm.enabled" (change)="setPerm(perm)" />
<span class="lever"></span>
</label>
</div>
</div>
</div>
</div>
</div>
</div>
</ng-container>
</mz-modal-content>
<mz-modal-footer>
@@ -14,7 +14,7 @@ import { PackageService } from './package.service';
})
export class PackagesComponent implements OnInit {
@ViewChild('appSettingsModal', { static: false }) appSettingsModal;
isLoadingApp = false;
folder = FolderType;
currentPackage: any = { package: { packageName: '', name: '', icon: '' }, versionCode: 0 };
routerPackage: string;
@@ -225,6 +225,7 @@ export class PackagesComponent implements OnInit {
});
}
getCurrentInstalledInfo() {
this.isLoadingApp = true;
this.adbService
.getBackups(this.currentPackage.package.packageName)
.then(backups => (this.backups = backups))
@@ -232,11 +233,13 @@ export class PackagesComponent implements OnInit {
.then(version => (this.currentPackage.versionCode = version))
.then(() => this.adbService.getPackagePermissions(this.currentPackage.package.packageName))
.then(perms => {
console.log(perms);
perms.forEach((p: any) => {
const perm_split = p.permission.split('.');
p.display_permission = perm_split[perm_split.length - 1];
});
this.perms = perms;
this.isLoadingApp = false;
})
.then(() => this.adbService.getDataBackups(this.currentPackage.package.packageName))
.then(dataBackups => (this.dataBackups = dataBackups));
@@ -244,18 +247,7 @@ export class PackagesComponent implements OnInit {
async backupApk(packageName: string) {
this.appSettingsModal.closeModal();
let location = await this.adbService.getPackageLocation(packageName);
this.adbService.backupPackage(location, packageName).then(savePath => {
// if (
// packageName === this.bsaberService.beatSaberPackage &&
// !this.bsaberService.backupExists()
// ) {
// this.appService.fs.copyFileSync(savePath, this.appService.path.join(this.appService.appData, 'bsaber-base.apk'));
// this.appService.fs.copyFileSync(
// savePath,
// this.appService.path.join(this.appService.appData, 'bsaber-base_patched.apk')
// );
// }
});
await this.adbService.backupPackage(location, packageName);
}
backupData(packageName) {
this.appSettingsModal.closeModal();
@@ -72,10 +72,8 @@ export class ProcessBucketService {
_name = 'app data restore';
break;
}
if (!this.tasks.length) {
this.statusService.showStatus('Starting ' + _name + '...');
}
this.tasks.push({
let task = new ProcessTask(this.statusService);
Object.assign(task, {
key,
name,
app_name,
@@ -83,6 +81,7 @@ export class ProcessBucketService {
status,
resolve,
});
this.tasks.push(task);
this.left_length = this.tasks.filter(t => !t.failed && !t.running && !t.cancelled && !t.succeeded).length;
}
@@ -1,36 +1,36 @@
<div class="relative">
<div class="tab" [ngClass]="{'active': !isSupport}" (click)="isSupport = false">Setup Instructions</div>
<div class="tab" [ngClass]="{'active': isSupport}" (click)="isSupport = true">Support Options</div>
<!-- <div class="tab-underline"></div>-->
<!-- <div class="tab-underline"></div>-->
</div>
<div class="inner-app-container text-dark-theme relative margin-top" *ngIf="isSupport">
<app-connection-status #connectionStatus></app-connection-status>
<div class="setup-container">
<div class="screen-description">Get help and support from SideQuest.</div>
<div class="divider divider-margin-top margin-bottom"></div>
<div class="hint-text">
<div class="pure-material-button-contained button-margin-bottom" (click)="connectionStatus.helpOpen = true">Fix It For Me</div>
<p>We have many solutions baked in to help you solve the most common problems. This is the best option becuase this info will always be the most up to date.</p><br>
<br><br>
<div class="pure-material-button-contained button-margin-bottom" (click)="appService.opn('https://sdq.st/support')">Open Support Community</div>
<p>If you are still having trouble then please visit our support community on SideQuest.</p><br>
<br><br>
<div *ngIf="adb.diagnostics.usb && adb.diagnostics.usb.log" class="pure-material-button-contained button-margin-bottom" (click)="uploadLogs();">{{'Upload Logs'}}</div>
<p *ngIf="adb.diagnostics.usb && adb.diagnostics.usb.log">If instructed to upload logs by a SideQuest support person, please click this button.</p><br>
<div *ngIf="link">
Copy and paste this link into your support request:
<h3>{{link}}</h3>
<div class="pure-material-button-contained button-margin-bottom" (click)="copyToClipboard()">Copy to Clipboard</div>
</div>
<div id="thankYou">
<ng-container *ngIf="link">Thank you!</ng-container>
<app-connection-status #connectionStatus></app-connection-status>
<div class="setup-container">
<div class="screen-description">Get help and support from SideQuest.</div>
<div class="divider divider-margin-top margin-bottom"></div>
<div class="hint-text">
<p>We have many solutions baked in to help you solve the most common problems. This is the best option becuase this info will always be the most up to date.</p>
<div class="pure-material-button-contained extra-margin-bottom" (click)="connectionStatus.helpOpen = true">Fix It For Me</div>
<br>
<p>If you are still having trouble then please visit our support community on SideQuest.</p>
<div class="pure-material-button-contained extra-margin-bottom" (click)="appService.opn('https://sdq.st/support')">Open Support Community</div>
<br>
<p *ngIf="adb.diagnostics.usb && adb.diagnostics.usb.log">If instructed to upload logs by a SideQuest support person, please click this button.</p>
<div *ngIf="adb.diagnostics.usb && adb.diagnostics.usb.log" class="pure-material-button-contained extra-margin-bottom" (click)="uploadLogs();">{{'Upload Logs'}}</div>
<div *ngIf="link">
Copy and paste this link into your support request:
<h3>{{link}}</h3>
<div class="pure-material-button-contained button-margin-bottom" (click)="copyToClipboard()">Copy to Clipboard</div>
</div>
<div id="thankYou">
<ng-container *ngIf="link">Thank you!</ng-container>
</div>
</div>
</div>
</div>
</div>
<div class="inner-app-container text-dark-theme relative margin-top" *ngIf="!isSupport">
<div class="inner-app-container text-dark-theme relative inner-app-container-margin-top" *ngIf="!isSupport">
<div class="pure-material-button-contained flat" [ngClass]="{'active': page === 1}" (click)="page = 1">Step 1: Create Org</div> >
<div class="pure-material-button-contained flat" [ngClass]="{'active': page === 2}" (click)="page = 2">Step 2: Dev Mode</div> >
<div class="pure-material-button-contained flat clearfix" [ngClass]="{'active': page === 3}" (click)="page = 3">Step 3: Connect</div>
@@ -67,7 +67,7 @@
<div class="setup-image-container">
<video class="setup-image tall" #enableDevMode autoplay="true" loop="true" controls="false" src="https://sidequestvr.com/assets/videos/enable_dev_mode.mp4" (error)="videoError(enableDevMode, $event, 'assets/setup/enable_dev_mode.mp4')" (click)="open('https://sidequestvr.com/assets/images/get-sidequest/verify.png')"></video>
</div>
<h3 i18n>
<h3 i18n>
Step 2: Enable Developer Mode and Reboot
</h3>
<div class="description-section" i18n>
@@ -81,7 +81,7 @@
<div class="setup-image-container">
<video class="setup-image" #connectAccept autoplay="true" loop="true" controls="false" src="https://sidequestvr.com/assets/videos/connect_accept.mp4" (error)="videoError(connectAccept, $event, 'assets/setup/connect_accept.mp4')"></video>
</div>
<h3 i18n>
<h3 i18n>
Step 3: Connect USB Cable and Allow USB Debugging
</h3>
<div class="description-section" i18n>
@@ -44,6 +44,7 @@
color: white;
background: #24284E;
cursor: pointer;
border-top: 2px #7289DA;
}
.tab.active{
background: #7289DA;
@@ -74,3 +75,7 @@
width: calc(100% - 350px);
}
}
.extra-margin-bottom{
margin-bottom: 45px;
margin-top: 20px;
}
@@ -12,6 +12,7 @@ export class StatusBarService {
this.status = status;
}
showStatus(message: string, isError?: boolean, isInfo?: boolean) {
console.warn('here');
this.status.showStatus(message, isError, isInfo);
}
hideStatus() {
+3 -1
View File
@@ -164,7 +164,6 @@ body{
}
.section-title {
margin-top: 1em;
margin-left: 1em;
}
.link,
.sort-link {
@@ -245,6 +244,9 @@ code > pre, .code{
padding-right: 80px;
color: white;
}
.inner-app-container-margin-top{
margin-top: 27px;
}
.margin-top{
margin-top: 1.5em;
}