-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1414 from RADAR-base/release-2.4.0-alpha
Release 2.4.0-alpha
- Loading branch information
Showing
22 changed files
with
2,672 additions
and
2,153 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <?xml version='1.0' encoding='utf-8'?> | ||
| <widget android-versionCode="564" id="org.phidatalab.radar_armt" ios-CFBundleIdentifier="org.phidatalab.radar-armt" ios-CFBundleVersion="1" version="2.3.0-alpha" xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <widget android-versionCode="565" id="org.phidatalab.radar_armt" ios-CFBundleIdentifier="org.phidatalab.radar-armt" ios-CFBundleVersion="1" version="2.4.0-alpha" xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <name>RADAR Questionnaire</name> | ||
| <description>An application that collects active data for research.</description> | ||
| <author email="[email protected]" href="http://radar-base.org/">RADAR-Base</author> | ||
|
|
@@ -149,7 +149,7 @@ | |
| <variable name="IOS_SHOULD_ESTABLISH_DIRECT_CHANNEL" value="true" /> | ||
| </plugin> | ||
| <plugin name="cordova-plugin-androidx-adapter" spec="^1.1.0" /> | ||
| <plugin name="cordova-plugin-background-mode" spec="git+https://bitbucket.org/TheBosZ/cordova-plugin-run-in-background.git" /> | ||
| <plugin name="cordova-plugin-background-mode" spec="https://bitbucket.org/TheBosZ/cordova-plugin-run-in-background.git" /> | ||
| <plugin name="com-darryncampbell-cordova-plugin-intent" spec="^2.0.0" /> | ||
| <plugin name="cordova-plugin-ionic-keyboard" spec="^2.2.0" /> | ||
| <plugin name="cordova-custom-config" spec="^5.1.0" /> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
src/app/pages/questions/components/finish-and-launch/finish-and-launch.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| <img src="assets/imgs/checkmark-big.svg" class="icon" alt="Completed" /> | ||
| <h2 text-center> | ||
| {{ content }} | ||
| <br /> | ||
| {{ externalAppLaunchDescription }} | ||
| </h2> | ||
| <div class="pos-bottom"> | ||
| <div class="pos-bottom-90"> | ||
| <div *ngIf="displayNextTaskReminder" class="next-task-highlight"> | ||
| {{ 'FINISH_NEXT_TASK_REMINDER' | translate }} | ||
| </div> | ||
| <ion-item no-lines *ngIf="requiresInClinicCompletion"> | ||
| <ion-label> | ||
| {{ 'FINISH_COMPLETED_IN_CLINIC' | translate }} | ||
| </ion-label> | ||
| <ion-toggle item-right [(ngModel)]="completedInClinic"></ion-toggle> | ||
| </ion-item> | ||
| </div> | ||
| <div class="done-button"> | ||
| <button | ||
| ion-button | ||
| class="bt bt--full" | ||
| round | ||
| full | ||
| *ngIf="showDoneButton" | ||
| (tap)="handleClosePage()" | ||
| > | ||
| {{ | ||
| canLaunch | ||
| ? ('EXTERNAL_APP_LAUNCH_BUTTON' | translate) | ||
| : ('BTN_DONE' | translate) | ||
| }} | ||
| </button> | ||
| <ng-container *ngIf="!showDoneButton && isShown"> | ||
| <div class="extra-info"> | ||
| <img | ||
| class="extra-info-icon" | ||
| src="assets/imgs/warning.png" | ||
| alt="Warning" | ||
| /> | ||
| {{ 'WARNING_DO_NOT_CLOSE_APP' | translate }} | ||
| </div> | ||
| <div> | ||
| <ion-spinner name="dots"></ion-spinner> | ||
| </div> | ||
| </ng-container> | ||
| </div> | ||
| </div> |
54 changes: 54 additions & 0 deletions
54
src/app/pages/questions/components/finish-and-launch/finish-and-launch.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| finish-and-launch { | ||
| ion-item.item { | ||
| margin-bottom: $item-separation-distance; | ||
| background-color: $cl-primary-40; | ||
| } | ||
|
|
||
| ion-item.item:last-child { | ||
| margin-bottom: 0; | ||
| } | ||
|
|
||
| .pos-bottom-90 { | ||
| padding-bottom: 32px; | ||
| } | ||
|
|
||
| .icon { | ||
| width: 30%; | ||
| } | ||
|
|
||
| .done-button { | ||
| padding: 0 24px; | ||
| } | ||
|
|
||
| .next-task-highlight { | ||
| padding: 4px; | ||
| background-color: $cl-warning-20; | ||
| font-size: 16px; | ||
| } | ||
|
|
||
| ion-spinner * { | ||
| padding-left: 10px; | ||
| width: 10px; | ||
| height: 30px; | ||
| background-color: #fff; | ||
| fill: #fff; | ||
| stroke: #fff; | ||
| } | ||
|
|
||
| .extra-info { | ||
| text-align: center; | ||
| text-transform: uppercase; | ||
| font-size: 2vh; | ||
| } | ||
|
|
||
| .extra-info-icon { | ||
| height: 1.5vh; | ||
| } | ||
|
|
||
| .pos-bottom { | ||
| position: absolute; | ||
| bottom: 32px; | ||
| left: 0; | ||
| width: 100%; | ||
| } | ||
| } |
Oops, something went wrong.