TerranQuest/App
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Item find results now much nicer looking

Browse Source
This commit is contained in:
Skylar Ittner 2016-08-20 23:57:24 -06:00
parent 57a4b4d18e
commit 6744ec52dc
10 changed files with 114 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock
View File

Binary file not shown.

BIN
platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin
View File

Binary file not shown.

BIN
platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin
View File

Binary file not shown.

BIN
platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin
View File

Binary file not shown.

30
platforms/android/assets/www/css/main.css
View File

@ -328,4 +328,34 @@ body {
#capturebtn {
color: black;
}
#found-box {
position: absolute;
z-index: 9001;
background: rgba(0, 0, 0, .5);
border-radius: 10px;
bottom: 12%;
left: 10%;
right: 10%;
height: fit-content;
max-height: 100px;
padding: 10px;
display: none;
}
#found-box-title {
font-size: 120%;
color: white;
border-left: 1px solid white;
padding-left: 5px;
}
#found-box-text {
color: white;
border-top: 1px solid white;
border-right: 1px solid white;
padding-right: 5px;
padding-left: 5px;
padding-top: 2px;
}

8
platforms/android/assets/www/js/main.js
View File

@ -87,12 +87,14 @@ function scanCode() {
code: result.text
}, function (data) {
if (data.status === 'OK') {
navigator.notification.alert("Found one " + data.message, null, "Found an item!", 'OK');
//navigator.notification.alert("Found one " + data.message, null, "Found an item!", 'OK');
showFoundBox("Found an item!", "Found one " + data.message);
} else {
navigator.notification.alert(data.message, null, "Huh?", 'OK');
showFoundBox("Huh?", data.message);
}
}).fail(function () {
navigator.notification.alert("Nothing happened!", null, "Huh?", 'OK');
showFoundBox("Huh?", "Nothing happened!");
//navigator.notification.alert("Nothing happened!", null, "Huh?", 'OK');
});
//navigator.notification.alert("Scanned code: " + result.text, null, "OK", 'Dismiss');
}

22
platforms/android/assets/www/screens/home.html
View File

@ -41,6 +41,15 @@
</div>
</div>
<div id="found-box">
<div id="found-box-title">
</div>
<div id="found-box-text">
</div>
</div>
<div id="chatbox">
<div class="well well-sm" id="chatmsgs"></div>
<div class="input-group" style="position: absolute; left: 0px; bottom: 0px; height: 35px; width: 100%; z-index: 9501;">
@ -56,6 +65,19 @@
<script>
$('#namedisp').text(username);
navigator.splashscreen.hide();
function showFoundBox(title, text) {
$('#found-box-title').text(title);
$('#found-box-text').text(text);
$('#found-box').fadeIn('fast');
setTimeout(function () {
$('#found-box').fadeOut('slow');
}, 5000);
}
$('#found-box').click(function (e) {
$('#found-box').fadeOut('fast');
});
</script>
<script src="js/location.js"></script>
<script src="js/user.js"></script>

30
www/css/main.css
View File

@ -328,4 +328,34 @@ body {
#capturebtn {
color: black;
}
#found-box {
position: absolute;
z-index: 9001;
background: rgba(0, 0, 0, .5);
border-radius: 10px;
bottom: 12%;
left: 10%;
right: 10%;
height: fit-content;
max-height: 100px;
padding: 10px;
display: none;
}
#found-box-title {
font-size: 120%;
color: white;
border-left: 1px solid white;
padding-left: 5px;
}
#found-box-text {
color: white;
border-top: 1px solid white;
border-right: 1px solid white;
padding-right: 5px;
padding-left: 5px;
padding-top: 2px;
}

8
www/js/main.js
View File

@ -87,12 +87,14 @@ function scanCode() {
code: result.text
}, function (data) {
if (data.status === 'OK') {
navigator.notification.alert("Found one " + data.message, null, "Found an item!", 'OK');
//navigator.notification.alert("Found one " + data.message, null, "Found an item!", 'OK');
showFoundBox("Found an item!", "Found one " + data.message);
} else {
navigator.notification.alert(data.message, null, "Huh?", 'OK');
showFoundBox("Huh?", data.message);
}
}).fail(function () {
navigator.notification.alert("Nothing happened!", null, "Huh?", 'OK');
showFoundBox("Huh?", "Nothing happened!");
//navigator.notification.alert("Nothing happened!", null, "Huh?", 'OK');
});
//navigator.notification.alert("Scanned code: " + result.text, null, "OK", 'Dismiss');
}

22
www/screens/home.html
View File

@ -41,6 +41,15 @@
</div>
</div>
<div id="found-box">
<div id="found-box-title">
</div>
<div id="found-box-text">
</div>
</div>
<div id="chatbox">
<div class="well well-sm" id="chatmsgs"></div>
<div class="input-group" style="position: absolute; left: 0px; bottom: 0px; height: 35px; width: 100%; z-index: 9501;">
@ -56,6 +65,19 @@
<script>
$('#namedisp').text(username);
navigator.splashscreen.hide();
function showFoundBox(title, text) {
$('#found-box-title').text(title);
$('#found-box-text').text(text);
$('#found-box').fadeIn('fast');
setTimeout(function () {
$('#found-box').fadeOut('slow');
}, 5000);
}
$('#found-box').click(function (e) {
$('#found-box').fadeOut('fast');
});
</script>
<script src="js/location.js"></script>
<script src="js/user.js"></script>