fixup

Callan003 · Oct 30, 2020 · 80c8407 · 80c8407
1 parent b831dda
commit 80c8407
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 8 deletions.
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
@@ -77,5 +77,10 @@
         </ion-button>
       </ion-col>
     </ion-row>
+    <ion-row *ngIf="alerts || driving">
+      <ion-col>
+        driving: {{overTheSpeedLimit}} alerts: {{alerts}}
+      </ion-col>
+    </ion-row>
   </ion-toolbar>
 </ion-footer>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
@@ -119,6 +119,8 @@ export class ChatPage implements OnInit {
       }
       this.sendMessageToFirebase(false);
     }
+    this.typingDnaRecorder.reset();
+    this.typingDnaRecorder.start();
   }
 
   async presentModal() {

diff --git a/src/app/pages/chat/settings-modal/settings-modal.component.html b/src/app/pages/chat/settings-modal/settings-modal.component.html
@@ -4,22 +4,24 @@
 </div>
 
 <div class="dialog-description">
+  <ion-list>
   <ion-item>
     <ion-label>Simulate Driving &nbsp; </ion-label>
     <ion-icon name='car-sport' [color]="driving ? 'danger': 'dark'"></ion-icon>
-    <ion-toggle color="danger" (ionChange)="driving = !driving" [checked]="driving"></ion-toggle>
+    <ion-checkbox color="danger" (ionChange)="changeDriving($event)" [checked]="driving" ></ion-checkbox>
   </ion-item>
   <ion-item>
     <ion-label>Show alerts &nbsp;</ion-label>
     <ion-icon name="warning" [color]="alerts ? 'danger': 'dark'"></ion-icon>
-    <ion-toggle color="danger" (ionChange)="alerts = !alerts" [checked]="alerts"></ion-toggle>
+    <ion-checkbox color="danger" (ionChange)="changeAlerts($event)" [checked]="alerts"></ion-checkbox>
   </ion-item>
   <ion-item>
     <ion-label>Quality (1-3)&nbsp;</ion-label>
     <ion-input name="quality" (ionChange)="changeQuality($event)" text-right type="number" color="danger" max="3" min="1" [value]="quality">
     </ion-input>
-    <ion-icon name="finger-print" class="rm15" slot="end"></ion-icon>
+    <ion-icon name="finger-print" class="rm05" slot="end"></ion-icon>
   </ion-item>
+  </ion-list>
 
 </div>
 

diff --git a/src/app/pages/chat/settings-modal/settings-modal.component.scss b/src/app/pages/chat/settings-modal/settings-modal.component.scss
@@ -8,8 +8,9 @@
 }
 .dialog-description{
   margin: 0 16px;
-  ion-toggle{
+  ion-checkbox{
     vertical-align: middle;
+    margin: 0 10px;
   }
   ion-icon{
     font-size: 25px;
@@ -24,8 +25,8 @@
   }
 }
 
-.rm15{
-  margin-right: 15px !important;
+.rm05{
+  margin-right: 5px !important;
 }
 
 .dialog-actions{

diff --git a/src/app/pages/chat/settings-modal/settings-modal.component.ts b/src/app/pages/chat/settings-modal/settings-modal.component.ts
@@ -10,7 +10,6 @@ export class SettingsModalComponent {
   @Input() alerts: boolean;
   @Input() driving: boolean;
   @Input() quality: number;
-  ngquality = 2;
 
   constructor(private modalController: ModalController) { }
 
@@ -31,4 +30,11 @@ export class SettingsModalComponent {
       this.quality = $event['detail'].value;
     }
   }
+
+  changeDriving($event: any) {
+    this.driving = $event['detail'].checked;
+  }
+  changeAlerts($event: any) {
+    this.alerts = $event['detail'].checked;
+  }
 }
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
@@ -83,7 +83,7 @@
   text-align: center;
 }
 .settings-modal .modal-wrapper{
-  height: 260px;
+  height: 275px;
   width: 90%;
   margin: 0 16px;
   border-radius: 8px;