beta build

android/app/src/main/AndroidManifest.xml

@@ -43,8 +43,12 @@
     </application>
 
     <!-- Permissions -->
+
+    <!-- my own permissions -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name = "android.permission.BLUETOOTH" />
-    <uses-permission android:name = "android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name = "android.permission.BLUETOOTH_ADMIN" />\
+
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- Camera, Photos, input file -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

package.json

@@ -9,7 +9,8 @@
     "build": "ng build",
     "test": "ng test",
     "lint": "ng lint",
-    "e2e": "ng e2e"
+    "e2e": "ng e2e",
+    "dev": "ionic serve --external --ssl"
   },
   "private": true,
   "dependencies": {
@@ -27,6 +28,7 @@
     "@ionic-native/status-bar": "^5.0.0",
     "@ionic-native/user-agent": "^5.30.0",
     "@ionic/angular": "^5.0.0",
+    "@ionic/storage": "^2.3.1",
     "cordova-plugin-background-mode": "^0.7.3",
     "cordova-plugin-device": "^2.0.3",
     "cordova-plugin-useragent": "^1.0.6",

src/app/app.module.ts

@@ -9,12 +9,13 @@ import { StatusBar } from '@ionic-native/status-bar/ngx';
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
 import { BackgroundMode } from '@ionic-native/background-mode/ngx';
+import { IonicStorageModule } from '@ionic/storage';
 
 @NgModule({
 	declarations: [AppComponent],
 	entryComponents: [],
-	imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule],
-	providers: [StatusBar, SplashScreen, BackgroundMode, { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }],
+	imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule, IonicStorageModule.forRoot()],
+	providers: [StatusBar, SplashScreen, BackgroundMode, { provide: RouteReuseStrategy, useClass: IonicRouteStrategy}],
 	bootstrap: [AppComponent],
 })
 export class AppModule {}

src/app/comp/AudioController.ts

@@ -2,7 +2,7 @@ import { EventEmitter as EventEmitterO } from 'events';
 import Peer from 'simple-peer';
 import * as io from 'socket.io-client';
 import { AmongUsState, GameState, Player } from './AmongUsState';
-import { SocketElementMap, SocketElement, Client, AudioElement, SocketClientMap } from './smallInterfaces';
+import { SocketElementMap, SocketElement, Client, AudioElement, SocketClientMap, IDeviceInfo } from './smallInterfaces';
 
 export default class AudioController extends EventEmitterO {
 	audioDeviceId = 'default';
@@ -133,6 +133,18 @@ export default class AudioController extends EventEmitterO {
 		element?.audioElement?.audioContext?.close();
 		element?.audioElement?.htmlAudioElement.remove();
 	}
+
+	async getDevices(): Promise<IDeviceInfo[]> {
+		let deviceId = 0;
+		return (await navigator.mediaDevices.enumerateDevices())
+			.filter((o) => o.kind === 'audioinput')
+			.map((o) => {
+				return {
+					label: o.label || `Microphone ${deviceId++}`,
+					deviceId: o.deviceId,
+				};
+			});
+	}
 }
 
 export const audioController = new AudioController();

src/app/comp/ConnectionController.ts

@@ -48,12 +48,12 @@ class ConnectionController extends EventEmitterO implements IConnectionControlle
 		return this.currentGameState.players.find((o) => o.clientId === clientId);
 	}
 
-	connect(gamecode: string, username: string, deviceID: string) {
+	connect(voiceserver: string, gamecode: string, username: string, deviceID: string) {
 		this.gamecode = gamecode;
 		this.amongusUsername = username;
 		this.deviceID = deviceID;
 		console.log('deviceID: ', deviceID);
-		this.initialize('https://crewl.ink');
+		this.initialize(voiceserver);
 		this.socketIOClient.emit('join', this.gamecode + '_mobile', Number(Date.now()), Number(Date.now()));
 	}
 

src/app/comp/smallInterfaces.ts

@@ -2,6 +2,13 @@ import Peer from 'simple-peer';
 import { Player } from './AmongUsState';
 import { connectionController } from './ConnectionController';
 
+export interface ISettings {
+	voiceServer: string;
+	username: string;
+	gamecode: string;
+	selectedMicrophone: string;
+}
+
 export interface Client {
 	playerId: number;
 	clientId: number;

src/app/main/main.page.html

@@ -10,33 +10,41 @@
 	<div *ngIf="!cManager.joined; else connected">
 		<ion-list lines="full" class="ion-no-margin">
 			<ion-list-header lines="full">
-				<ion-label fixed class='fixedLabel'> Connection information </ion-label>
+				<ion-label fixed class="fixedLabel"> Connection information </ion-label>
 			</ion-list-header>
 			<ion-item>
-				<ion-label  >Voice server</ion-label>
-				<ion-input [(ngModel)]="voiceserver" placeholder="Voice server"></ion-input>
+				<ion-label>Voice server</ion-label>
+				<ion-input
+					[(ngModel)]="settings.voiceServer"
+					(ionChange)="onSettingsChange()"
+					placeholder="Voice server"
+				></ion-input>
 			</ion-item>
 			<ion-item>
 				<ion-label>Ingame name</ion-label>
-				<ion-input [(ngModel)]="username" placeholder="ingamename"></ion-input>
+				<ion-input
+					[(ngModel)]="settings.username"
+					(ionChange)="onSettingsChange()"
+					placeholder="ingamename"
+				></ion-input>
 			</ion-item>
 			<ion-item>
 				<ion-label>Lobby code</ion-label>
-				<ion-input [(ngModel)]="gamecode" placeholder="lobbycode"></ion-input>
+				<ion-input [(ngModel)]="settings.gamecode" (ionChange)="onSettingsChange()" placeholder="lobbycode"></ion-input>
 			</ion-item>
 			<ion-item>
 				<ion-label>Microphone</ion-label>
-				<ion-select [(ngModel)]="selectedMicrophone" [compareWith]="compareFn">
-					<ion-select-option
-						*ngFor="let microphone of microphones;  let i = index"
-						[value]="microphone"
-						>{{microphone.label}} -</ion-select-option
+				<ion-select
+					[(ngModel)]="settings.selectedMicrophone"
+					[compareWith]="compareFn"
+					(ionChange)="onSettingsChange()"
+				>
+					<ion-select-option *ngFor="let microphone of microphones;" [value]="microphone.deviceId"
+						>{{microphone.label}}</ion-select-option
 					>
 				</ion-select>
 			</ion-item>
-
 			<hr />
-
 			<ion-item>
 				<ion-button (click)="connect()">Connect</ion-button>
 			</ion-item>

src/app/main/main.page.ts

@@ -5,59 +5,64 @@ import Peer from 'simple-peer';
 import { connectionController, IConnectionController as IConnectionController } from '../comp/ConnectionController';
 import { GameState, AmongUsState } from '../comp/AmongUsState';
 import { promise } from 'protractor';
-import { IDeviceInfo } from '../comp/smallInterfaces';
-
+import { IDeviceInfo, ISettings } from '../comp/smallInterfaces';
+import { Storage } from '@ionic/storage';
+import { audioController } from '../comp/AudioController';
 
 @Component({
 	selector: 'app-main',
 	templateUrl: './main.page.html',
 	styleUrls: ['./main.page.scss'],
 })
 export class MainPage implements OnInit {
-	constructor() {
-		connectionController.on('gamestateChange', (gamestate: AmongUsState) => {});
-		this.cManager = connectionController;
-	}
 	client: SocketIOClient.Socket;
 	peerConnections: Array<Peer> = [];
 	cManager: IConnectionController;
 	gameState: AmongUsState;
-	username = 'G';
-	gamecode = 'DEV12345';
-	testing: any = [];
 	microphones: IDeviceInfo[] = [];
-	selectedMicrophone: IDeviceInfo;
+	settings: ISettings = {
+		gamecode: '',
+		voiceServer: 'https://crewl.ink',
+		username: '',
+		selectedMicrophone: 'default',
+	};
 
-	async getDevices(): Promise<IDeviceInfo[]> {
-		let deviceId = 0;
-		return (await navigator.mediaDevices.enumerateDevices())
-			.filter((o) => o.kind === 'audioinput')
-			.map((o) => {
-				return {
-					label: o.label || `Microphone ${deviceId++}`,
-					deviceId: o.deviceId,
-				};
-			});
+	constructor(private storage: Storage) {
+		connectionController.on('gamestateChange', (gamestate: AmongUsState) => {});
+		this.cManager = connectionController;
+		storage.get('settings').then((val) => {
+			console.log('gotsettings', val);
+			if (val && val !== null) {
+				this.settings = val;
+			}
+		});
 	}
 
 	connect() {
-		console.log('[ConnectButton].[click]', {
-			gamecode: this.gamecode,
-			username: this.username,
-			selectedDevice: this.selectedMicrophone,
-		});
-		const audioSelect = document.querySelector('select#audioSource') as HTMLSelectElement;
-		connectionController.connect(this.gamecode, this.username, this.selectedMicrophone.deviceId);
+		connectionController.connect(
+			this.settings.voiceServer,
+			this.settings.gamecode,
+			this.settings.username,
+			this.settings.selectedMicrophone
+		);
 	}
 
 	disconnect() {
 		connectionController.disconnect();
 	}
 
+	onSettingsChange() {
+		console.log('onsettingschange');
+		this.storage.set('settings', this.settings);
+	}
+
+	compareFn(e1: string, e2: string): boolean {
+		return e1 && e2 ? e1 === e2 : false;
+	}
+
 	ngOnInit() {
-		this.getDevices().then((o) => {
+		audioController.getDevices().then((o) => {
 			this.microphones = o;
-			this.selectedMicrophone = this.microphones[0];
 		});
 	}
 }