From 80c8407fcdcccffe906f42428aa824037f372cc1 Mon Sep 17 00:00:00 2001 From: Calin Date: Sat, 31 Oct 2020 00:54:07 +0200 Subject: [PATCH] fixup --- src/app/pages/chat/chat.page.html | 5 +++++ src/app/pages/chat/chat.page.ts | 2 ++ .../chat/settings-modal/settings-modal.component.html | 8 +++++--- .../chat/settings-modal/settings-modal.component.scss | 7 ++++--- .../pages/chat/settings-modal/settings-modal.component.ts | 8 +++++++- src/theme/variables.scss | 2 +- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index a003f8c..75ef7ee 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -77,5 +77,10 @@ + + + driving: {{overTheSpeedLimit}} alerts: {{alerts}} + + diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 207452e..3782016 100644 --- 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 index 2bdc783..e9cdbfe 100644 --- 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 @@
+ Simulate Driving   - + Show alerts   - + Quality (1-3)  - + +
diff --git a/src/app/pages/chat/settings-modal/settings-modal.component.scss b/src/app/pages/chat/settings-modal/settings-modal.component.scss index d2f205b..ffb978b 100644 --- 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 index fa5b2da..d9deb92 100644 --- 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 index 48cbf24..e17592f 100644 --- 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;