From de03678b3cf36d5ca1c05e0498bc7171d925ead3 Mon Sep 17 00:00:00 2001
From: OhMyGuus <info@guus.ninja>
Date: Tue, 5 Jan 2021 20:49:44 +0100
Subject: [PATCH] Small fixes with merge

---
 android/app/src/main/res/xml/config.xml |  9 +++++++++
 package-lock.json                       |  5 +++++
 package.json                            |  2 +-
 src/app/app.component.html              |  4 ++--
 src/app/comp/ConnectionController.ts    |  1 -
 src/app/main/main.page.html             | 15 ++++++++-------
 src/app/main/main.page.ts               |  3 +--
 7 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/android/app/src/main/res/xml/config.xml b/android/app/src/main/res/xml/config.xml
index 788a08c..532fe6d 100644
--- a/android/app/src/main/res/xml/config.xml
+++ b/android/app/src/main/res/xml/config.xml
@@ -17,10 +17,19 @@
     <param name="android-package" value="org.apache.cordova.device.Device"/>
   </feature>
 
+  <feature name="File">
+    <param name="android-package" value="org.apache.cordova.file.FileUtils"/>
+    <param name="onload" value="true"/>
+  </feature>
+
   <feature name="UserAgent">
     <param name="android-package" value="im.ltdev.cordova.UserAgent"/>
     <param name="onload" value="true"/>
   </feature>
 
+  <feature name="Capture">
+    <param name="android-package" value="org.apache.cordova.mediacapture.Capture"/>
+  </feature>
+
   
 </widget>
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 6fc051f..8c0303c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4135,6 +4135,11 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.3.tgz",
       "integrity": "sha512-Jb3V72btxf3XHpkPQsGdyc8N6tVBYn1vsxSFj43fIz9vonJDUThYPCJJHqk6PX6N4dJw6I4FjxkpfCR4LDYMlw=="
     },
+    "cordova-plugin-file": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-file/-/cordova-plugin-file-6.0.2.tgz",
+      "integrity": "sha512-m7cughw327CjONN/qjzsTpSesLaeybksQh420/gRuSXJX5Zt9NfgsSbqqKDon6jnQ9Mm7h7imgyO2uJ34XMBtA=="
+    },
     "cordova-plugin-media-capture": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/cordova-plugin-media-capture/-/cordova-plugin-media-capture-3.0.3.tgz",
diff --git a/package.json b/package.json
index 835c7e2..2c8c0fa 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,6 @@
   "dependencies": {
     "@angular/common": "~10.0.0",
     "@angular/core": "~10.0.0",
-    "@angular/devkit": "~10.0.0",
     "@angular/forms": "~10.0.0",
     "@angular/platform-browser": "~10.0.0",
     "@angular/platform-browser-dynamic": "~10.0.0",
@@ -36,6 +35,7 @@
     "cordova-plugin-android-permissions": "^1.1.2",
     "cordova-plugin-background-mode": "^0.7.3",
     "cordova-plugin-device": "^2.0.3",
+    "cordova-plugin-file": "^6.0.2",
     "cordova-plugin-useragent": "^1.0.6",
     "rxjs": "~6.5.5",
     "simple-peer": "git+https://github.com/vrnagy/simple-peer.git",
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 520fde1..e7e369b 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,5 +1,5 @@
 <ion-app>
-    <ion-menu contentId="main-content" >
+    <!-- <ion-menu contentId="main-content" >
       <ion-content>
         <ion-list id="inbox-list">
 
@@ -11,6 +11,6 @@
           </ion-menu-toggle>
         </ion-list>
       </ion-content>
-    </ion-menu>
+    </ion-menu> -->
     <ion-router-outlet id="main-content"></ion-router-outlet>
 </ion-app>
diff --git a/src/app/comp/ConnectionController.ts b/src/app/comp/ConnectionController.ts
index 5f213f9..aaced8a 100644
--- a/src/app/comp/ConnectionController.ts
+++ b/src/app/comp/ConnectionController.ts
@@ -58,7 +58,6 @@ class ConnectionController extends EventEmitterO implements IConnectionControlle
 		this.gamecode = gamecode;
 		this.amongusUsername = username;
 		this.deviceID = deviceID;
-		console.log('deviceID: ', deviceID);
 		this.initialize(voiceserver);
 		this.socketIOClient.emit('join', this.gamecode + '_mobile', Number(Date.now()), Number(Date.now()));
 	}
diff --git a/src/app/main/main.page.html b/src/app/main/main.page.html
index b82f3bf..c486c88 100644
--- a/src/app/main/main.page.html
+++ b/src/app/main/main.page.html
@@ -1,7 +1,7 @@
 <ion-header>
 	<ion-toolbar color="primary">
 		<ion-buttons slot="start">
-			<ion-menu-button></ion-menu-button>
+			<!-- <ion-menu-button></ion-menu-button> -->
 		</ion-buttons>
 		<ion-title>Better Crewlink Mobile v0.0.3</ion-title>
 	</ion-toolbar>
@@ -9,7 +9,7 @@
 <ion-content color="secondary">
 	<ng-container [ngSwitch]="cManager.connectionState">
 		<ng-container *ngSwitchDefault>
-			<ion-list lines="full" class="ion-no-margin" style="background-color: #25232a;">
+			<ion-list lines="full" class="ion-no-margin" style="background-color: #25232a">
 				<ion-list-header lines="full" color="secondary">
 					<ion-label fixed class="fixedLabel"> Connection Settings: </ion-label>
 				</ion-list-header>
@@ -32,8 +32,9 @@
 				<ion-item color="secondary">
 					<ion-label>Lobby code</ion-label>
 					<ion-input
+						style="text-transform: uppercase"
+						pattern="[A-Za-z]{6}"
 						[(ngModel)]="settings.gamecode"
-						(ngModelChange)="settings.gamecode = $event.toLocaleUpperCase()"
 						(ionChange)="onSettingsChange()"
 						placeholder="'ABCDEF'"
 						maxlength="6"
@@ -60,13 +61,13 @@
 			</ion-list>
 		</ng-container>
 		<ng-container *ngSwitchCase="1">
-			<ion-spinner name="dots" style="float: left; margin-top: 10px;" color="light"></ion-spinner>
-			<p style="float: inline-end;"><b>Waiting for you to join</b></p>
-			<p>**Please make sure there is a PC user with "Mobile Host" enabled on Crewlink**</p>
+			<ion-spinner name="dots" style="float: left; margin-top: 10px" color="light"></ion-spinner>
+			<p style="float: inline-end"><b>Waiting for you to join</b></p>
+			<p><i>**Please make sure there is a PC user with "Mobile Host" enabled on Crewlink**</i></p>
 			<ion-button (click)="disconnect()">disconnect</ion-button>
 		</ng-container>
 		<ng-container *ngSwitchCase="2">
-			<ion-list lines="full" class="ion-no-margin" style="background-color: #25232a;">
+			<ion-list lines="full" class="ion-no-margin" style="background-color: #25232a">
 				<ion-list-header lines="full" color="secondary">
 					<ion-label>Connected Players:</ion-label>
 				</ion-list-header>
diff --git a/src/app/main/main.page.ts b/src/app/main/main.page.ts
index 5051eef..ae42623 100644
--- a/src/app/main/main.page.ts
+++ b/src/app/main/main.page.ts
@@ -42,8 +42,6 @@ export class MainPage implements OnInit {
 	}
 
 	connect() {
-		alert('testing..');
-
 		this.requestPermissions().then((haspermissions) => {
 			if (haspermissions) {
 				connectionController.connect(
@@ -98,6 +96,7 @@ export class MainPage implements OnInit {
 
 	ngOnInit() {
 		audioController.getDevices().then((o) => {
+			this.settings.selectedMicrophone = o[0]?.deviceId ?? 'default';
 			this.microphones = o;
 		});
 	}