TerranQuest/Game
1
0
Fork 0
Code Issues 4 Pull Requests Releases 1 Wiki Activity

Bugfixes: close #22, fix API signin, bump version to 2.0.1

Browse Source
This commit is contained in:
Skylar Ittner 2019-06-14 22:58:37 -06:00
parent cc8857c9f6
commit 80ec053408
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?> <?xml version="1.0" encoding="utf-8" standalone="no"?>
<widget xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" id="com.netsyms.terranquest.TerranQuest" version="2.0.0"> <widget xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" id="com.netsyms.terranquest.TerranQuest" version="2.0.1">
<name>TerranQuest</name> <name>TerranQuest</name>
<description> <description>
A mobile augmented reality fantasy game. A mobile augmented reality fantasy game.
@ -19,7 +19,7 @@
<preference name="ShowSplashScreenSpinner" value="false"/> <preference name="ShowSplashScreenSpinner" value="false"/>
<platform name="android"> <platform name="android">
<preference name="android-minSdkVersion" value="21" /> <preference name="android-minSdkVersion" value="21" />
<preference name="HeaderColor" value="#324150"/> <preference name="HeaderColor" value="#324150"/>
<preference name="StatusBarBackgroundColor" value=""/> <preference name="StatusBarBackgroundColor" value=""/>
<allow-intent href="market:*"/> <allow-intent href="market:*"/>
@ -29,7 +29,7 @@
<icon background="res/android/mipmap-xhdpi/ic_launcher_background.png" density="xhdpi" foreground="res/android/mipmap-xhdpi/ic_launcher_foreground.png" src="res/android/mipmap-xhdpi/ic_launcher.png" /> <icon background="res/android/mipmap-xhdpi/ic_launcher_background.png" density="xhdpi" foreground="res/android/mipmap-xhdpi/ic_launcher_foreground.png" src="res/android/mipmap-xhdpi/ic_launcher.png" />
<icon background="res/android/mipmap-xxhdpi/ic_launcher_background.png" density="xxhdpi" foreground="res/android/mipmap-xxhdpi/ic_launcher_foreground.png" src="res/android/mipmap-xxhdpi/ic_launcher.png" /> <icon background="res/android/mipmap-xxhdpi/ic_launcher_background.png" density="xxhdpi" foreground="res/android/mipmap-xxhdpi/ic_launcher_foreground.png" src="res/android/mipmap-xxhdpi/ic_launcher.png" />
<icon background="res/android/mipmap-xxxhdpi/ic_launcher_background.png" density="xxxhdpi" foreground="res/android/mipmap-xxxhdpi/ic_launcher_foreground.png" src="res/android/mipmap-xxxhdpi/ic_launcher.png" /> <icon background="res/android/mipmap-xxxhdpi/ic_launcher_background.png" density="xxxhdpi" foreground="res/android/mipmap-xxxhdpi/ic_launcher_foreground.png" src="res/android/mipmap-xxxhdpi/ic_launcher.png" />
<resource-file src="res/android/mipmap-anydpi-v26/ic_launcher.xml" target="app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" /> <resource-file src="res/android/mipmap-anydpi-v26/ic_launcher.xml" target="app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" />
<splash src="res/android/drawable-land-hdpi/screen.png" density="land-hdpi"/> <splash src="res/android/drawable-land-hdpi/screen.png" density="land-hdpi"/>
<splash src="res/android/drawable-land-ldpi/screen.png" density="land-ldpi"/> <splash src="res/android/drawable-land-ldpi/screen.png" density="land-ldpi"/>

12
www/js/api.js
View File

@ -80,8 +80,10 @@ function checkClientVersion(success, failure) {
* @return {undefined} * @return {undefined}
*/ */
function callAPI(action, data, success, failure) { function callAPI(action, data, success, failure) {
data.username = localStorage.getItem("username"); if (typeof data.username == "undefined" && typeof data.password == "undefined") {
data.password = localStorage.getItem("password"); data.username = localStorage.getItem("username");
data.password = localStorage.getItem("password");
}
return $.ajax({ return $.ajax({
type: 'POST', type: 'POST',
dataType: 'json', dataType: 'json',
@ -133,8 +135,10 @@ function callAPI(action, data, success, failure) {
* @return {undefined} * @return {undefined}
*/ */
function callAPIRawResponse(action, data, success, failure) { function callAPIRawResponse(action, data, success, failure) {
data.username = localStorage.getItem("username"); if (typeof data.username == "undefined" && typeof data.password == "undefined") {
data.password = localStorage.getItem("password"); data.username = localStorage.getItem("username");
data.password = localStorage.getItem("password");
}
return $.ajax({ return $.ajax({
type: 'POST', type: 'POST',
url: getActionUrl(action), url: getActionUrl(action),

2
www/js/platform.js
View File

@ -118,7 +118,7 @@ function initCordova() {
// height is incorrectly set to 0px, causing the clock and icons to overlap // height is incorrectly set to 0px, causing the clock and icons to overlap
// on the TerranQuest UI. // on the TerranQuest UI.
document.addEventListener("deviceready", function () { document.addEventListener("deviceready", function () {
if (device.platform == "Android" && device.version == "8.0.0" && getComputedStyle(document.documentElement).getPropertyValue('--f7-statusbar-height') == "0px") { if (device.platform == "Android" && device.version.startsWith("8.0") && getComputedStyle(document.documentElement).getPropertyValue('--f7-statusbar-height').startsWith("0")) {
document.documentElement.style.setProperty('--f7-statusbar-height', '24px'); document.documentElement.style.setProperty('--f7-statusbar-height', '24px');
} }
}, false); }, false);