Merge pull request #1845 from RADAR-base/release-3.3.1-alpha

Release 3.3.1-alpha

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "org.phidatalab.radar_armt"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 586
-        versionName "3.3.0-alpha"
+        versionCode 587
+        versionName "3.3.1-alpha"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
     <string name="app_name">RADAR Questionnaire</string>
-    <string name="title_activity_main">RADAR Active RMT</string>
+    <string name="title_activity_main">RADAR Questionnaire</string>
     <string name="package_name">org.phidatalab.radar_armt</string>
     <string name="custom_url_scheme">org.phidatalab.radar_armt</string>
 </resources>

ios/App/App/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.0</string>
+	<string>3.3.1</string>
 	<key>CFBundleVersion</key>
-	<string>3.3.0</string>
+	<string>3.3.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

package.json

@@ -1,7 +1,7 @@
 {
   "name": "radar-questionnaire",
   "description": "An application that collects active data for research.",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "author": "RADAR Base",
   "homepage": "http://www.radar-base.org/",
   "scripts": {

src/app/pages/questions/components/question/checkbox-input/checkbox-input.component.scss

@@ -24,6 +24,7 @@ ion-item {
   justify-content: flex-start;
   margin-bottom: 16px;
   --ripple-color: transparent;
+  --background-hover: none;
 }
 
 ion-label {

src/app/pages/questions/components/question/question.component.html

@@ -112,7 +112,6 @@ <h2 dir="auto">
 
       <timed-test
         *ngSwitchCase="'timed'"
-        [heading]="question.field_label"
         [image]="question.field_annotation.image"
         [timer]="question.field_annotation.timer"
         [currentlyShown]="currentlyShown"

src/app/pages/questions/components/question/radio-input/radio-input.component.scss

@@ -48,6 +48,7 @@ ion-item {
   white-space: normal;
   margin-bottom: 16px;
   --ripple-color: transparent;
+  --background-hover: none;
 }
 
 ion-radio {

src/app/pages/questions/components/question/text-input/text-input.component.html

@@ -30,7 +30,7 @@
       enterkeyhint="next"
       placeholder="{{ 'PLACEHOLDER_TEXT_INPUT' | translate }}"
       [(ngModel)]="textValue"
-      (ionChange)="emitAnswer('')"
+      (ngModelChange)="emitAnswer($event)"
       (ionFocus)="emitKeyboardEvent('focus')"
       (ionBlur)="emitKeyboardEvent('blur')"
       (keyup)="emitKeyboardEvent($event.key)"

src/app/pages/questions/components/question/text-input/text-input.component.ts

@@ -135,7 +135,7 @@ export class TextInputComponent implements OnInit {
   }
 
   datePickerObj: any = {}
-  selectedDate: string = new Date().toLocaleDateString()
+  selectedDate: string = this.localization.moment(Date.now()).format('L')
 
   async openDatePicker() {
     const datePickerModal = await this.modalCtrl.create({
@@ -149,10 +149,11 @@ export class TextInputComponent implements OnInit {
     await datePickerModal.present()
 
     datePickerModal.onDidDismiss().then(data => {
-      this.selectedDate = data.data.date
+      let date = moment(data.data.date)
+      date = date.isValid() ? date : this.localization.moment(this.selectedDate)
+      this.selectedDate = date.format('L')
 
-      // transfer local date format all to US format to easily parse the data
-      const date = moment(data.data.date)
+      // Transfer local date format all to US format to easily parse the data
       this.defaultDatePickerValue = {
         year: date.format('YYYY'),
         month: date.format('M'),

src/global.scss

@@ -217,4 +217,17 @@ body.scanner-active {
 
 ion-modal {
   --background: transparent !important;
-}
+
+  ion-header > ion-toolbar {
+    --background: var(--cl-secondary) !important;
+  }
+
+  ion-list > ion-item {
+    --background: transparent !important;
+  }
+}
+
+.dp-month-year-scroll-container {
+  --background: var(--cl-primary-20) !important;
+  background-color: var(--cl-primary-20) !important;
+}