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

Bugfixes for #7, #8, upgrade jQuery to 1.12.4

Browse Source 
Add status bar back (with custom colors) (fixes #7)
Remove i18n jQuery (fixes #8)
This commit is contained in:
Skylar Ittner 2016-09-26 17:16:00 -06:00
parent 80026384aa
commit a141968ffd
6 changed files with 11078 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
config.xml
View File

@ -10,50 +10,47 @@
<icon src="res/icon.png" />
<preference name="SplashScreen" value="res/splash.9.png" />
<preference name="FadeSplashScreen" value="true" />
<preference name="FadeSplashScreenDuration" value="2000" />
<preference name="SplashScreenDelay" value="1000" />
<preference name="FadeSplashScreenDuration" value="1000" />
<preference name="SplashScreenDelay" value="0" />
<preference name="SplashMaintainAspectRatio" value="false" />
<preference name="SplashShowOnlyFirstTime" value="true" />
<preference name="AutoHideSplashScreen" value="false" />
<preference name="ShowSplashScreen" value="true" />
<platform name="ios">
<icon src="res/ios/icon-60@3x.png" width="180" height="180" />
<icon src="res/ios/icon-60.png" width="60" height="60" />
<icon src="res/ios/icon-60@2x.png" width="120" height="120" />
<icon src="res/ios/icon-76.png" width="76" height="76" />
<icon src="res/ios/icon-76@2x.png" width="152" height="152" />
<icon src="res/ios/icon-40.png" width="40" height="40" />
<icon src="res/ios/icon-40@2x.png" width="80" height="80" />
<icon src="res/ios/icon.png" width="57" height="57" />
<icon src="res/ios/icon@2x.png" width="114" height="114" />
<icon src="res/ios/icon-72.png" width="72" height="72" />
<icon src="res/ios/icon-72@2x.png" width="144" height="144" />
<icon src="res/ios/icon-small.png" width="29" height="29" />
<icon src="res/ios/icon-small@2x.png" width="58" height="58" />
<icon src="res/ios/icon-50.png" width="50" height="50" />
<icon src="res/ios/icon-50@2x.png" width="100" height="100" />
<icon src="res/ios/icon-83.5@2x.png" width="167" height="167" />
<splash src="res/ios/Default~iphone.png" width="320" height="480"/>
<splash src="res/ios/Default@2x~iphone.png" width="640" height="960"/>
<splash src="res/ios/Default-Portrait~ipad.png" width="768" height="1024"/>
<splash src="res/ios/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
<splash src="res/ios/Default-Landscape~ipad.png" width="1024" height="768"/>
<splash src="res/ios/Default-Landscape@2x~ipad.png" width="2048" height="1536"/>
<splash src="res/ios/Default-568h@2x~iphone.png" width="640" height="1136"/>
<splash src="res/ios/Default-667h.png" width="750" height="1334"/>
<splash src="res/ios/Default-736h.png" width="1242" height="2208"/>
<splash src="res/ios/Default-Landscape-736h.png" width="2208" height="1242"/>
<!-- Fix iOS special-ness -->
<icon height="180" src="res/ios/icon-60@3x.png" width="180" />
<icon height="60" src="res/ios/icon-60.png" width="60" />
<icon height="120" src="res/ios/icon-60@2x.png" width="120" />
<icon height="76" src="res/ios/icon-76.png" width="76" />
<icon height="152" src="res/ios/icon-76@2x.png" width="152" />
<icon height="40" src="res/ios/icon-40.png" width="40" />
<icon height="80" src="res/ios/icon-40@2x.png" width="80" />
<icon height="57" src="res/ios/icon.png" width="57" />
<icon height="114" src="res/ios/icon@2x.png" width="114" />
<icon height="72" src="res/ios/icon-72.png" width="72" />
<icon height="144" src="res/ios/icon-72@2x.png" width="144" />
<icon height="29" src="res/ios/icon-small.png" width="29" />
<icon height="58" src="res/ios/icon-small@2x.png" width="58" />
<icon height="50" src="res/ios/icon-50.png" width="50" />
<icon height="100" src="res/ios/icon-50@2x.png" width="100" />
<icon height="167" src="res/ios/icon-83.5@2x.png" width="167" />
<splash height="480" src="res/ios/Default~iphone.png" width="320" />
<splash height="960" src="res/ios/Default@2x~iphone.png" width="640" />
<splash height="1024" src="res/ios/Default-Portrait~ipad.png" width="768" />
<splash height="2048" src="res/ios/Default-Portrait@2x~ipad.png" width="1536" />
<splash height="768" src="res/ios/Default-Landscape~ipad.png" width="1024" />
<splash height="1536" src="res/ios/Default-Landscape@2x~ipad.png" width="2048" />
<splash height="1136" src="res/ios/Default-568h@2x~iphone.png" width="640" />
<splash height="1334" src="res/ios/Default-667h.png" width="750" />
<splash height="2208" src="res/ios/Default-736h.png" width="1242" />
<splash height="1242" src="res/ios/Default-Landscape-736h.png" width="2208" />
<preference name="DisallowOverscroll" value="true" />
<preference name="KeyboardShrinksView" value="true" />
<preference name="StatusBarOverlaysWebView" value="false" />
<preference name="StatusBarStyle" value="blackopaque" />
<preference name="ShowSplashScreen" value="true" />
</platform>
<platform name="browser">
<preference name="ShowSplashScreen" value="false" />
</platform>
<preference name="StatusBarOverlaysWebView" value="false" />
<preference name="StatusBarStyle" value="blackopaque" />
<content src="index.html" />
<access origin="*" />
<allow-navigation href="*" />
@ -85,8 +82,8 @@
<plugin name="cordova_app_version_plugin" spec="~0.2.6" />
<plugin name="cordova-plugin-ios-longpress-fix" spec="~1.1.0" />
<plugin name="cordova-plugin-keyboard" spec="~1.1.4" />
<plugin name="cordova-plugin-statusbar" spec="~2.2.0" />
<engine name="browser" spec="~4.0.0" />
<engine name="browser" spec="latest" />
<engine name="android" spec="latest" />
<engine name="ios" spec="~4.2.1" />
<engine name="ios" spec="latest" />
<plugin name="cordova-plugin-statusbar" spec="~2.2.0" />
</widget>

3
nbproject/plugins.properties
View File

@ -24,3 +24,6 @@ cordova-plugin-inapppurchase=https://github.com/AlexDisler/cordova-plugin-inappp
cordova_app_version_plugin=https://github.com/Binarypark/cordova_app_version_plugin
cordova-plugin-file=https://git-wip-us.apache.org/repos/asf/cordova-plugin-file.git
cordova-plugin-compat=https://git-wip-us.apache.org/repos/asf/cordova-plugin-compat.git
cordova-plugin-keyboard=https://github.com/cjpearson/cordova-plugin-keyboard
cordova-plugin-statusbar=https://github.com/apache/cordova-plugin-statusbar
cordova-plugin-ios-longpress-fix=https://github.com/EddyVerbruggen/cordova-plugin-ios-longpress-fix

7
www/index.html
View File

@ -43,13 +43,8 @@
<link href="css/L.Control.Locate.css" rel="stylesheet">
<link href="css/MarkerCluster.css" rel="stylesheet">
<!-- jQuery Version 1.11.1 -->
<!-- jQuery Version 1.12.4 -->
<script src="js/jquery.js"></script>
<!-- i18n -->
<script src="js/jquery.localize.js"></script>
<script>
var i18n_options = {pathPrefix: "lang", skipLanguage: "en-US"};
</script>
<!-- Bootstrap Core JavaScript -->
<script src="js/bootstrap.js"></script>

11012
www/js/jquery.js vendored
View File

File diff suppressed because one or more lines are too long

21
www/js/main.js
View File

@ -36,7 +36,7 @@ $(document).ready(function () {
});
function onDeviceReady() {
StatusBar.hide();
StatusBar.backgroundColorByHexString("#324150");
openscreen("login");
if (navigator.network.connection.type === Connection.NONE) {
navigator.notification.alert("You need an Internet connection to continue.", function () {
@ -105,6 +105,25 @@ function mkApiUrl(action, server) {
}
}
function changeStatusBarColorForScreen(screenname) {
StatusBar.backgroundColorByHexString("#324150"); // Splash background color
/*switch (screenname) {
case 'login':
case 'signup':
case 'chooseteam':
StatusBar.backgroundColorByHexString("#060606");
break;
case 'menu':
StatusBar.backgroundColorByHexString("#060606");
break;
case 'home':
StatusBar.backgroundColorByHexString("#008000");
break;
default:
StatusBar.backgroundColorByHexString("#324150"); // Splash background color
}*/
}
/**
* Switches the app to the given screen.
* @param {String} screenname The name of the screen to show.

27
www/screens/login.html
View File

@ -87,21 +87,18 @@
</div>
</div>
<script>
$('#gameserver-url-box').val(localStorage.getItem("gameserv"));
$('#chatserver-url-box').val(localStorage.getItem("chatserv"));
function setCustomServers() {
localStorage.setItem("gameserv", $('#gameserver-url-box').val());
localStorage.setItem("chatserv", $('#chatserver-url-box').val());
}
$("[data-localize]").localize("login-screen", i18n_options);
$('.splash-version').text("v" + window.cordova.plugins.version.getAppVersion());
userset = false;
passset = false;
var userset = false;
var passset = false;
if (localStorage.getItem("username") !== null && localStorage.getItem("username") !== '') {
$('#usernameBox').val(localStorage.getItem("username"));
userset = true;
@ -115,13 +112,13 @@
// Try to login with stored credentials
$.post("https://sso.netsyms.com/api/simpleauth.php",
{user: localStorage.getItem("username"), pass: localStorage.getItem("password")},
function (data) {
if (data === 'OK') {
dologin();
} else {
$('#loading').css('display', 'none');
}
}).fail(function () {
function (data) {
if (data === 'OK') {
dologin();
} else {
$('#loading').css('display', 'none');
}
}).fail(function () {
$('#loading').css('display', 'none');
});
} else {