From 629dc242fdbc5b2fb6dc4450b66e8dfd15e73603 Mon Sep 17 00:00:00 2001 From: Shane Harris Date: Mon, 4 Jul 2022 12:00:26 +0200 Subject: [PATCH] removed the light/dark theme code --- desktop-app/src/app/audica.service.ts | 1 - .../src/app/content/content.component.html | 2 +- .../src/app/content/content.component.ts | 13 +- .../current-tasks.component.html | 2 +- desktop-app/src/app/electron.service.ts | 2 - .../src/app/files/files.component.html | 12 +- .../src/app/header/header.component.ts | 1 - desktop-app/src/app/link/link.component.html | 2 +- .../package-item/package-item.component.ts | 7 +- .../package.service.ts} | 6 +- .../src/app/packages/packages.component.html | 3 +- .../src/app/packages/packages.component.ts | 10 +- desktop-app/src/app/repo.service.spec.ts | 12 - .../src/app/setup/setup.component.html | 32 +-- .../src/app/tools/tools.component.html | 238 +++++++++--------- desktop-app/src/app/tools/tools.component.ts | 4 +- package.json | 2 +- 17 files changed, 154 insertions(+), 195 deletions(-) rename desktop-app/src/app/{repo.service.ts => packages/package.service.ts} (88%) delete mode 100644 desktop-app/src/app/repo.service.spec.ts diff --git a/desktop-app/src/app/audica.service.ts b/desktop-app/src/app/audica.service.ts index c583d3c..8f63ff2 100644 --- a/desktop-app/src/app/audica.service.ts +++ b/desktop-app/src/app/audica.service.ts @@ -22,7 +22,6 @@ export class AudicaService { let parts = downloadUrl.split('/'); let zipPath = this.appService.path.join(this.appService.appData, this.appService.path.basename(downloadUrl)); let ws = this.appService.fs.createWriteStream(zipPath); - //let name = parts[parts.length - 1].split('.')[0]; const requestOptions = { timeout: 30000, 'User-Agent': this.appService.getUserAgent(), diff --git a/desktop-app/src/app/content/content.component.html b/desktop-app/src/app/content/content.component.html index 5aea4fe..08d92cc 100644 --- a/desktop-app/src/app/content/content.component.html +++ b/desktop-app/src/app/content/content.component.html @@ -1,3 +1,3 @@ -
+
diff --git a/desktop-app/src/app/content/content.component.ts b/desktop-app/src/app/content/content.component.ts index 6574bef..1ef9cf3 100644 --- a/desktop-app/src/app/content/content.component.ts +++ b/desktop-app/src/app/content/content.component.ts @@ -1,16 +1,13 @@ import { Component, OnInit } from '@angular/core'; -import { RepoService } from '../repo.service'; import { AppService } from '../app.service'; @Component({ - selector: 'app-content', - templateUrl: './content.component.html', - styleUrls: ['./content.component.css'] + selector: 'app-content', + templateUrl: './content.component.html', + styleUrls: ['./content.component.css'], }) export class ContentComponent implements OnInit { - constructor(repoService:RepoService, public appService:AppService) { } - - ngOnInit() { - } + constructor(public appService: AppService) {} + ngOnInit() {} } diff --git a/desktop-app/src/app/current-tasks/current-tasks.component.html b/desktop-app/src/app/current-tasks/current-tasks.component.html index 0b92740..0bd65ed 100644 --- a/desktop-app/src/app/current-tasks/current-tasks.component.html +++ b/desktop-app/src/app/current-tasks/current-tasks.component.html @@ -1,5 +1,5 @@
-

No tasks running...

+

No tasks running...

diff --git a/desktop-app/src/app/electron.service.ts b/desktop-app/src/app/electron.service.ts index 364255d..675ecd0 100644 --- a/desktop-app/src/app/electron.service.ts +++ b/desktop-app/src/app/electron.service.ts @@ -1,6 +1,5 @@ import { Injectable, isDevMode } from '@angular/core'; import { AppService } from './app.service'; -import { RepoService } from './repo.service'; import { StatusBarService } from './status-bar.service'; import { LoadingSpinnerService } from './loading-spinner.service'; import { AdbClientService } from './adb-client.service'; @@ -19,7 +18,6 @@ export class ElectronService { isInstallingLauncher: boolean; constructor( private appService: AppService, - private repoService: RepoService, private statusService: StatusBarService, private spinnerService: LoadingSpinnerService, private adbService: AdbClientService, diff --git a/desktop-app/src/app/files/files.component.html b/desktop-app/src/app/files/files.component.html index fa5b3fe..db94929 100644 --- a/desktop-app/src/app/files/files.component.html +++ b/desktop-app/src/app/files/files.component.html @@ -10,21 +10,18 @@
-

+

No device connected yet...

-

+

No files here...

{{this.currentPath}}
-
+
{{file.size|number:'1.2-2'}}MB | {{file.time|date:'short'}} @@ -37,8 +34,7 @@ (click)="filesToBeDeleted = [file]; confirmModal.openModal()">close
- {{file.icon}} + {{file.icon}}
{{file.name}}
diff --git a/desktop-app/src/app/header/header.component.ts b/desktop-app/src/app/header/header.component.ts index 09466d7..a001219 100644 --- a/desktop-app/src/app/header/header.component.ts +++ b/desktop-app/src/app/header/header.component.ts @@ -4,7 +4,6 @@ import { AppService, FolderType } from '../app.service'; import { WebviewService } from '../webview.service'; import { LoadingSpinnerService } from '../loading-spinner.service'; import { StatusBarService } from '../status-bar.service'; -import { RepoService } from '../repo.service'; import { BeatOnService } from '../beat-on.service'; import { DragAndDropService } from '../drag-and-drop.service'; import { Router } from '@angular/router'; diff --git a/desktop-app/src/app/link/link.component.html b/desktop-app/src/app/link/link.component.html index 41900ca..936eef2 100644 --- a/desktop-app/src/app/link/link.component.html +++ b/desktop-app/src/app/link/link.component.html @@ -1 +1 @@ -{{text}} +{{text}} diff --git a/desktop-app/src/app/package-item/package-item.component.ts b/desktop-app/src/app/package-item/package-item.component.ts index 6fea64d..81f5903 100644 --- a/desktop-app/src/app/package-item/package-item.component.ts +++ b/desktop-app/src/app/package-item/package-item.component.ts @@ -1,5 +1,4 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { RepoService } from '../repo.service'; @Component({ selector: 'app-package-item', @@ -7,9 +6,9 @@ import { RepoService } from '../repo.service'; styleUrls: ['./package-item.component.css'], }) export class PackageItemComponent implements OnInit { - @Input('package') package: any; - @Output('settings') settings = new EventEmitter(); - constructor(public repoService: RepoService) {} + @Input() package: any; + @Output() settings = new EventEmitter(); + constructor() {} ngOnInit() {} diff --git a/desktop-app/src/app/repo.service.ts b/desktop-app/src/app/packages/package.service.ts similarity index 88% rename from desktop-app/src/app/repo.service.ts rename to desktop-app/src/app/packages/package.service.ts index 36e25dd..cf6dede 100644 --- a/desktop-app/src/app/repo.service.ts +++ b/desktop-app/src/app/packages/package.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; -import { AppService } from './app.service'; +import { AppService } from '../app.service'; @Injectable({ providedIn: 'root', }) -export class RepoService { +export class PackageService { allApps: any = {}; - indexUrl: string = 'https://the-expanse.github.io/SideQuestRepos/'; + indexUrl = 'https://the-expanse.github.io/SideQuestRepos/'; constructor(private appService: AppService) { this.getAppIndex(); } diff --git a/desktop-app/src/app/packages/packages.component.html b/desktop-app/src/app/packages/packages.component.html index 9e97436..d31c6f1 100644 --- a/desktop-app/src/app/packages/packages.component.html +++ b/desktop-app/src/app/packages/packages.component.html @@ -1,8 +1,7 @@
-

+

No device connected...

diff --git a/desktop-app/src/app/packages/packages.component.ts b/desktop-app/src/app/packages/packages.component.ts index 1be7adf..83b52a9 100644 --- a/desktop-app/src/app/packages/packages.component.ts +++ b/desktop-app/src/app/packages/packages.component.ts @@ -5,7 +5,7 @@ import { LoadingSpinnerService } from '../loading-spinner.service'; import { StatusBarService } from '../status-bar.service'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { RepoService } from '../repo.service'; +import { PackageService } from './package.service'; @Component({ selector: 'app-packages', @@ -37,7 +37,7 @@ export class PackagesComponent implements OnInit { public appService: AppService, public spinnerService: LoadingSpinnerService, public statusService: StatusBarService, - private repoService: RepoService, + private packageService: PackageService, router: Router, route: ActivatedRoute ) { @@ -141,10 +141,10 @@ export class PackagesComponent implements OnInit { .then(() => { this.myApps = this.adbService.devicePackages .map(p => { - if (this.repoService.allApps[p]) { + if (this.packageService.allApps[p]) { return { - name: this.repoService.allApps[p].name, - icon: this.repoService.allApps[p].icon, + name: this.packageService.allApps[p].name, + icon: this.packageService.allApps[p].icon, packageName: p, }; } diff --git a/desktop-app/src/app/repo.service.spec.ts b/desktop-app/src/app/repo.service.spec.ts deleted file mode 100644 index df6d77d..0000000 --- a/desktop-app/src/app/repo.service.spec.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { RepoService } from './repo.service'; - -describe('RepoService', () => { - beforeEach(() => TestBed.configureTestingModule({})); - - it('should be created', () => { - const service: RepoService = TestBed.get(RepoService); - expect(service).toBeTruthy(); - }); -}); diff --git a/desktop-app/src/app/setup/setup.component.html b/desktop-app/src/app/setup/setup.component.html index 2799780..28840b1 100644 --- a/desktop-app/src/app/setup/setup.component.html +++ b/desktop-app/src/app/setup/setup.component.html @@ -1,6 +1,6 @@
-
+
Step 1: Create Organisation
@@ -17,7 +17,7 @@
-
+
Step 2: Install Drivers ( Windows Only - skip this on Mac / Linux )
@@ -38,7 +38,7 @@
-
+
Step 3: Enable Developer Mode and Reboot
@@ -53,7 +53,7 @@
-
+
Step 4: Connect USB Cable and Allow USB Debugging
@@ -71,25 +71,25 @@
-
-
+
+
Step 5: Install App Launcher
-
+
Install a launcher to make finding apps easier on your headset. This launcher will be found in the library under 'Unknown Sources' on the menu on the left. Open it to find all the apps that have been installed on your device.

SideQuest Launcher Installed! -
Install App Launcher


-
+
You will then be able to install apps to your headset and open them from the launcher. You can find it in the side menu of the library under the Unknown Sources section called SideQuest - TV and SideQuest - Home. This will show you all the apps on the device even hidden @@ -97,16 +97,16 @@

The Expanse VR Installed! -
Install Your First App - The Expanse


-
+
If you want to install your own APK files just drag and drop them over this window.
-
+
Check your antivirus hasn't blocked some parts of the ADB download - this has happened for some with Avast antivirus in particular.
If you have any problems or want to say hi drop us a line on discord - . @@ -117,10 +117,10 @@