Skip to content

Commit 3696c4f

Browse files
github-actions[bot]github-actions[bot]
authored
Merge develop into feature/validateVariables
2 parents 31345a6 + 51c2cf7 commit 3696c4f

File tree

2 files changed

+212
-93
lines changed

2 files changed

+212
-93
lines changed

‎src/android_popup.html‎

Lines changed: 211 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,113 @@
11
<!doctype html>
22
<html>
3-
<head>
4-
<title>How are you?</title>
5-
<style>
6-
body { width: 100%; height: 60px; margin: auto; background: white; text-align: center; }
7-
.rating-section { width: 100%; opacity: 1; height: 56px; padding-top: 5px; padding-bottom: 1px;}
8-
.rating-section img { width: 15%; display: inline-block; padding-left: 4px;
9-
padding-right: 4px; background-color: #FFFFFF; transition: all 200ms linear; }
10-
.rating-section img:hover { -webkit-filter: brightness(110%) saturate(125%); }
11-
#loader { display: none; transition: opacity 400ms linear; margin: auto; padding-top: 10px; background-color: #edeaec; }
12-
.invisible {
13-
-webkit-animation-name: fadeOut;
14-
-webkit-animation-duration:0.4s;
15-
-webkit-animation-iteration-count: 1;
16-
-webkit-animation-timing-function: ease;
17-
-webkit-animation-fill-mode: forwards;
18-
}
19-
@-webkit-keyframes fadeOut {
20-
from { -webkit-transform: rotate(0deg) scale(1) skew(0deg); opacity: 1; }
21-
to { -webkit-transform: rotate(0deg) scale(0.98) skew(0deg); opacity: 0; }
22-
}
23-
.visible {
24-
-webkit-animation-name: fadeIn;
25-
-webkit-animation-duration:0.3s;
26-
-webkit-animation-iteration-count: 1;
27-
-webkit-animation-timing-function: ease;
28-
-webkit-animation-fill-mode: forwards;
29-
}
30-
@-webkit-keyframes fadeIn {
31-
from { -webkit-transform: rotate(0deg) scale(1.02) skew(0deg); opacity: 0; }
32-
to { -webkit-transform: rotate(0deg) scale(1) skew(0deg); opacity: 1; }
33-
}
34-
.btn-xl {
35-
width: 52px;
36-
height: 52px;
37-
border-radius: 26px;
38-
background-color: white;
39-
line-height: 1.33;
40-
transition: all 200ms linear;
41-
font-family: "Comic Sans MS", cursive, sans-serif;
42-
}
43-
.btn-xl:focus {
44-
outline: none;
45-
}
46-
.btn-xl:hover {
47-
-webkit-filter: brightness(110%) saturate(125%);
48-
}
49-
</style>
50-
<script src="cordova.js"></script>
51-
<!-- build:js scripts/popup-combined-head-libraries.js -->
52-
<script src="lib/q/q.js"></script>
53-
<script src="lib/bugsnag/dist/bugsnag.js"></script>
54-
<script src="lib/quantimodo/quantimodo-web.js"></script>
55-
<script src="lib/localforage/dist/localforage.js"></script>
56-
<script src="lib/underscore/underscore-min.js"></script>
57-
<script src="js/qmLogger.js"></script>
58-
<script src="js/qmHelpers.js"></script>
59-
<script src="data/appSettings.js"></script> <!-- Must come after qmHelpers because we assign to qm.staticData -->
3+
<head>
4+
<title>How are you?</title>
5+
<!--suppress CssUnusedSymbol -->
6+
<style>
7+
body {
8+
width: 100%;
9+
height: 60px;
10+
margin: auto;
11+
background: white;
12+
text-align: center;
13+
}
14+
15+
.rating-section {
16+
width: 100%;
17+
opacity: 1;
18+
height: 56px;
19+
padding-top: 5px;
20+
padding-bottom: 1px;
21+
}
22+
23+
.rating-section img {
24+
width: 15%;
25+
display: inline-block;
26+
padding-left: 4px;
27+
padding-right: 4px;
28+
background-color: #FFFFFF;
29+
transition: all 200ms linear;
30+
}
31+
32+
.rating-section img:hover {
33+
-webkit-filter: brightness(110%) saturate(125%);
34+
}
35+
36+
#loader {
37+
display: none;
38+
transition: opacity 400ms linear;
39+
margin: auto;
40+
padding-top: 10px;
41+
background-color: #edeaec;
42+
}
43+
44+
.invisible {
45+
-webkit-animation-name: fadeOut;
46+
-webkit-animation-duration: 0.4s;
47+
-webkit-animation-iteration-count: 1;
48+
-webkit-animation-timing-function: ease;
49+
-webkit-animation-fill-mode: forwards;
50+
}
51+
52+
@-webkit-keyframes fadeOut {
53+
from {
54+
-webkit-transform: rotate(0deg) scale(1) skew(0deg);
55+
opacity: 1;
56+
}
57+
to {
58+
-webkit-transform: rotate(0deg) scale(0.98) skew(0deg);
59+
opacity: 0;
60+
}
61+
}
62+
63+
.visible {
64+
-webkit-animation-name: fadeIn;
65+
-webkit-animation-duration: 0.3s;
66+
-webkit-animation-iteration-count: 1;
67+
-webkit-animation-timing-function: ease;
68+
-webkit-animation-fill-mode: forwards;
69+
}
70+
71+
@-webkit-keyframes fadeIn {
72+
from {
73+
-webkit-transform: rotate(0deg) scale(1.02) skew(0deg);
74+
opacity: 0;
75+
}
76+
to {
77+
-webkit-transform: rotate(0deg) scale(1) skew(0deg);
78+
opacity: 1;
79+
}
80+
}
81+
82+
.btn-xl {
83+
width: 52px;
84+
height: 52px;
85+
border-radius: 26px;
86+
background-color: white;
87+
line-height: 1.33;
88+
transition: all 200ms linear;
89+
font-family: "Comic Sans MS", cursive, sans-serif;
90+
}
91+
92+
.btn-xl:focus {
93+
outline: none;
94+
}
95+
96+
.btn-xl:hover {
97+
-webkit-filter: brightness(110%) saturate(125%);
98+
}
99+
</style>
100+
<!--suppress HtmlUnknownTarget -->
101+
<script src="cordova.js"></script>
102+
<!-- build:js scripts/popup-combined-head-libraries.js -->
103+
<script src="lib/q/q.js"></script>
104+
<script src="lib/bugsnag/dist/bugsnag.js"></script>
105+
<script src="lib/quantimodo/quantimodo-web.js"></script>
106+
<script src="lib/localforage/dist/localforage.js"></script>
107+
<script src="lib/underscore/underscore-min.js"></script>
108+
<script src="js/qmLogger.js"></script>
109+
<script src="js/qmHelpers.js"></script>
110+
<script src="data/appSettings.js"></script> <!-- Must come after qmHelpers because we assign to qm.staticData -->
60111
<script src="data/qmStates.js"></script>
61112
<script src="data/stateNames.js"></script>
62113
<script src="data/buildInfo.js"></script>
@@ -65,40 +116,107 @@
65116
<script defer src="data/commonVariables.js"></script>
66117
<script defer src="data/docs.js"></script>
67118
<script defer src="data/dialogAgent.js"></script>
68-
<script src="js/popup.js"></script>
69-
<!-- endbuild -->
70-
</head>
71-
<body>
72-
<!--<img style="width: 24px; left:10px; position: absolute;" src="https://app.quantimo.do/ionic/Modo/www/img/intro/inbox.svg" id="buttonInbox">-->
73-
<p style="text-align: center; font-size: 20px;" id="question">How are you?</p>
74-
<section id="faceRatingButtons" class="rating-section">
75-
<img src="img/rating/face_rating_button_256_depressed.png" id="buttonMoodDepressed"><span>&nbsp;</span>
76-
<img src="img/rating/face_rating_button_256_sad.png" id="buttonMoodSad"><span>&nbsp;</span>
77-
<img src="img/rating/face_rating_button_256_ok.png" id="buttonMoodOk"><span>&nbsp;</span>
78-
<img src="img/rating/face_rating_button_256_happy.png" id="buttonMoodHappy"><span>&nbsp;</span>
79-
<img src="img/rating/face_rating_button_256_ecstatic.png" id="buttonMoodEcstatic">
80-
</section>
81-
<section id="numericRatingButtons" class="rating-section">
82-
<img src="img/rating/numeric_rating_button_256_1.png" id="button1"><span>&nbsp;</span>
83-
<img src="img/rating/numeric_rating_button_256_2.png" id="button2"><span>&nbsp;</span>
84-
<img src="img/rating/numeric_rating_button_256_3.png" id="button3"><span>&nbsp;</span>
85-
<img src="img/rating/numeric_rating_button_256_4.png" id="button4"><span>&nbsp;</span>
86-
<img src="img/rating/numeric_rating_button_256_5.png" id="button5">
87-
</section>
88-
<section id="lastValueSection" class="rating-section">
89-
<button id="lastValueButton" style="color: #337ab7; border: 3px solid #337ab7;" class="btn-xl"><span id="lastValue">How are you?</span></button>
90-
<button id="secondToLastValueButton" style="color: #5cb85c; border: 3px solid #5cb85c;" type="button" class="btn btn-success btn-circle btn-xl"><span id="secondToLastValue">How are you?</span></button>
91-
<button id="thirdToLastValueButton" style="color: #5bc0de; border: 3px solid #5bc0de;" type="button" class="btn btn-info btn-circle btn-xl"><span id="thirdToLastValue">How are you?</span></button>
92-
<button id="snoozeButton" style="color: #f0ad4e; border: 3px solid #f0ad4e;" type="button" class="btn-xl">
93-
z<sup> z<sup> z</sup></sup>
94-
</button>
95-
<button id="skipButton" style="color: #d9534f; border: 3px solid #d9534f; font-size: 24px;" type="button" class="btn btn-danger btn-circle btn-xl">X</button>
96-
<button id="buttonInbox" style="color: #5cb85c; border: 3px solid #5cb85c; font-size: 24px;" type="button" class="btn btn-success btn-circle btn-xl">?</button>
97-
</section>
98-
<section id="loader">
99-
<!--<img src="img/loaders/rainbow-loader.gif" id="popTartCat">-->
100-
<img style="max-height: 100%" src="img/loaders/purple-upload-check-loader_cropped_56px.gif" id="purpleLoader">
101-
<!--<img src="img/loaders/pop_tart_cat_blue_background.gif" id="popTartCat">-->
102-
</section>
103-
</body>
119+
<script src="js/popup.js"></script>
120+
<!-- endbuild -->
121+
</head>
122+
<body>
123+
<!--<img style="width: 24px; left:10px; position: absolute;" src="https://app.quantimo.do/ionic/Modo/www/img/intro/inbox.svg" id="buttonInbox">-->
124+
<p style="text-align: center; font-size: 20px;"
125+
id="question">
126+
How are you?
127+
</p>
128+
<section id="faceRatingButtons"
129+
class="rating-section">
130+
<img src="img/rating/face_rating_button_256_depressed.png"
131+
id="buttonMoodDepressed"
132+
alt="Rate 5 out of 5"
133+
title="Worst"><span>&nbsp;</span>
134+
<img src="img/rating/face_rating_button_256_sad.png"
135+
id="buttonMoodSad"
136+
alt="Rate 5 out of 5"
137+
title="Bad"><span>&nbsp;</span>
138+
<img src="img/rating/face_rating_button_256_ok.png"
139+
id="buttonMoodOk"
140+
alt="Rate 5 out of 5"
141+
title="OK"><span>&nbsp;</span>
142+
<img src="img/rating/face_rating_button_256_happy.png"
143+
id="buttonMoodHappy"
144+
alt="Rate 5 out of 5"
145+
title="Good"><span>&nbsp;</span>
146+
<img src="img/rating/face_rating_button_256_ecstatic.png"
147+
id="buttonMoodEcstatic"
148+
alt="Rate 5 out of 5"
149+
title="Best">
150+
</section>
151+
<section id="numericRatingButtons" class="rating-section">
152+
<img src="img/rating/numeric_rating_button_256_1.png"
153+
id="button1"
154+
alt="Rate 1 out of 5"
155+
title="Weakest"><span>&nbsp;</span>
156+
<img src="img/rating/numeric_rating_button_256_2.png"
157+
id="button2"
158+
alt="Rate 2 out of 5"
159+
title="Weak"><span>&nbsp;</span>
160+
<img src="img/rating/numeric_rating_button_256_3.png"
161+
id="button3"
162+
alt="Rate 3 out of 5"
163+
title="Moderate"><span>&nbsp;</span>
164+
<img src="img/rating/numeric_rating_button_256_4.png"
165+
id="button4"
166+
alt="Rate 4 out of 5"
167+
title="Strong"><span>&nbsp;</span>
168+
<img src="img/rating/numeric_rating_button_256_5.png"
169+
id="button5"
170+
alt="Rate 5 out of 5"
171+
title="Strongest">
172+
</section>
173+
<section id="lastValueSection"
174+
class="rating-section">
175+
<button id="lastValueButton"
176+
style="color: #337ab7; border: 3px solid #337ab7;"
177+
class="btn-xl">
178+
<span id="lastValue">How are you?</span>
179+
</button>
180+
<button id="secondToLastValueButton"
181+
style="color: #5cb85c; border: 3px solid #5cb85c;"
182+
type="button"
183+
class="btn btn-success btn-circle btn-xl">
184+
<span id="secondToLastValue">How are you?</span>
185+
</button>
186+
<button id="thirdToLastValueButton"
187+
style="color: #5bc0de; border: 3px solid #5bc0de;"
188+
type="button"
189+
class="btn btn-info btn-circle btn-xl">
190+
<span id="thirdToLastValue">How are you?</span>
191+
</button>
192+
<button id="snoozeButton"
193+
title="Snooze and ask me later"
194+
style="color: #f0ad4e; border: 3px solid #f0ad4e;"
195+
type="button"
196+
class="btn-xl">
197+
z<sup> z<sup> z</sup></sup>
198+
</button>
199+
<button id="skipButton"
200+
title="Skip this time"
201+
style="color: #d9534f; border: 3px solid #d9534f; font-size: 24px;"
202+
type="button"
203+
class="btn btn-danger btn-circle btn-xl">X
204+
</button>
205+
<button id="buttonInbox"
206+
title="Go to Full Inbox for More Options"
207+
style="color: #5cb85c; border: 3px solid #5cb85c; font-size: 24px;"
208+
type="button"
209+
class="btn btn-success btn-circle btn-xl">
210+
?
211+
</button>
212+
</section>
213+
<section id="loader">
214+
<!--<img src="img/loaders/rainbow-loader.gif" id="popTartCat">-->
215+
<img style="max-height: 100%"
216+
src="img/loaders/purple-upload-check-loader_cropped_56px.gif"
217+
id="purpleLoader"
218+
alt="Loading Image">
219+
<!--<img src="img/loaders/pop_tart_cat_blue_background.gif" id="popTartCat">-->
220+
</section>
221+
</body>
104222
</html>

‎src/js/qmHelpers.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12851,6 +12851,7 @@ if(typeof window !== "undefined"){
1285112851
qm.urlHelper.redirectToHttpsIfNecessary();
1285212852
}else{
1285312853
module.exports = qm;
12854+
global.qm = qm;
1285412855
}
1285512856
if(qm.platform.isChromeExtension()){
1285612857
qm.chrome.initialize();

0 commit comments

Comments
 (0)