diff --git a/config.xml b/config.xml
index 2e7b0a6997e9c48f03ac355c273cc423939fb343..202494814d0d3ac69b686b46eddc14c019aa2610 100644
--- a/config.xml
+++ b/config.xml
@@ -1,98 +1,103 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version='1.0' encoding='utf-8'?>
<widget id="com.Dimago.Betskills" version="2.0.9" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
- <name>Betskills</name>
- <description>
+ <name>Betskills</name>
+ <description>
Betskills app to see predictions of football and tennis games.
</description>
- <author email="contact@betskills.com" href="">
+ <author email="contact@betskills.com" href="">
Betskills team
</author>
- <content src="index.html"/>
- <access origin="*"/>
- <preference name="webviewbounce" value="false"/>
- <preference name="UIWebViewBounce" value="false"/>
- <preference name="DisallowOverscroll" value="true"/>
- <preference name="SplashScreenDelay" value="5000"/>
- <preference name="ShowSplashScreenSpinner" value="false"/>
- <preference name="android-minSdkVersion" value="23"/>
- <preference name="BackupWebStorage" value="none"/>
- <preference name="SplashScreen" value="screen"/>
- <preference name="xwalkVersion" value="18+"/>
- <preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect"/>
- <preference name="xwalkMode" value="embedded"/>
- <preference name="xwalkMultipleApk" value="true"/>
- <preference name="Orientation" value="portrait"/>
- <feature name="StatusBar">
- <param name="ios-package" onload="true" value="CDVStatusBar"/>
- </feature>
- <plugin name="cordova-plugin-console" spec="~1.0.3"/>
- <plugin name="cordova-plugin-whitelist" spec="~1.2.2"/>
- <plugin name="cordova-plugin-splashscreen" spec="~3.2.2"/>
- <plugin name="cordova-plugin-statusbar" spec="~2.1.3"/>
- <plugin name="ionic-plugin-keyboard" spec="~2.2.1"/>
- <plugin name="cordova-plugin-firebase" spec="~0.1.18"/>
- <plugin name="cordova-plugin-device" spec="~1.1.3"/>
- <plugin name="cordova-plugin-file-transfer" spec="~1.6.1"/>
- <plugin name="cordova-plugin-inapppurchase" spec="~1.1.0"/>
- <plugin name="cordova-plugin-x-toast" spec="https://github.com/EddyVerbruggen/Toast-PhoneGap-Plugin.git"/>
- <plugin name="cordova-plugin-badge" spec="https://github.com/katzer/cordova-plugin-badge.git"/>
- <plugin name="cordova-plugin-facebook4" spec="~1.7.4">
- <variable name="APP_ID" value="1830882820517971"/>
- <variable name="APP_NAME" value="Betskills"/>
- </plugin>
- <plugin name="com.jcjee.plugins.emailcomposer" spec="https://github.com/jcjee/email-composer.git"/>
- <platform name="ios">
- <access origin="cdvfile://*"/>
- <allow-intent href="cdvfile://*"/>
- <preference name="iosPersistentFileLocation" value="Library"/>
- <splash src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" height="1136"/>
- <splash src="resources/ios/splash/Default-667h.png" width="750" height="1334"/>
- <splash src="resources/ios/splash/Default-736h.png" width="1242" height="2208"/>
- <splash src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
- <splash src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" height="2732"/>
- <splash src="resources/ios/splash/Default-Portrait~ipad.png" width="768" height="1024"/>
- <splash src="resources/ios/splash/Default@2x~iphone.png" width="640" height="960"/>
- <splash src="resources/ios/splash/Default~iphone.png" width="320" height="480"/>
- <icon src="resources/ios/icon/icon.png" width="57" height="57"/>
- <icon src="resources/ios/icon/icon@2x.png" width="114" height="114"/>
- <icon src="resources/ios/icon/icon-40.png" width="40" height="40"/>
- <icon src="resources/ios/icon/icon-40@2x.png" width="80" height="80"/>
- <icon src="resources/ios/icon/icon-40@3x.png" width="120" height="120"/>
- <icon src="resources/ios/icon/icon-50.png" width="50" height="50"/>
- <icon src="resources/ios/icon/icon-50@2x.png" width="100" height="100"/>
- <icon src="resources/ios/icon/icon-60.png" width="60" height="60"/>
- <icon src="resources/ios/icon/icon-60@2x.png" width="120" height="120"/>
- <icon src="resources/ios/icon/icon-60@3x.png" width="180" height="180"/>
- <icon src="resources/ios/icon/icon-72.png" width="72" height="72"/>
- <icon src="resources/ios/icon/icon-72@2x.png" width="144" height="144"/>
- <icon src="resources/ios/icon/icon-76.png" width="76" height="76"/>
- <icon src="resources/ios/icon/icon-76@2x.png" width="152" height="152"/>
- <icon src="resources/ios/icon/icon-83.5@2x.png" width="167" height="167"/>
- <icon src="resources/ios/icon/icon-small.png" width="29" height="29"/>
- <icon src="resources/ios/icon/icon-small@2x.png" width="58" height="58"/>
- <icon src="resources/ios/icon/icon-small@3x.png" width="87" height="87"/>
- </platform>
- <platform name="android">
- <preference name="android-minSdkVersion" value="23"/>
- <preference name="android-targetSdkVersion" value="23"/>
- <preference name="SplashMaintainAspectRatio" value="true"/>
- <preference name="SplashShowOnlyFirstTime" value="false"/>
- <preference name="AndroidPersistentFileLocation" value="Compatibility"/>
- <preference name="android-build-tool" value="gradle"/>
- <access origin="cdvfile://*"/>
- <allow-intent href="cdvfile://*"/>
- <splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi"/>
- <splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi"/>
- <splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi"/>
- <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi"/>
- <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/>
- <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
- <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
- <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
- <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
- <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
- <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
- <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
- </platform>
- <icon src="resources/android/icon/drawable-xhdpi-icon.png"/>
+ <content src="index.html" />
+ <access origin="*" />
+ <preference name="webviewbounce" value="false" />
+ <preference name="UIWebViewBounce" value="false" />
+ <preference name="DisallowOverscroll" value="true" />
+ <preference name="SplashScreenDelay" value="5000" />
+ <preference name="ShowSplashScreenSpinner" value="false" />
+ <preference name="android-minSdkVersion" value="23" />
+ <preference name="BackupWebStorage" value="none" />
+ <preference name="SplashScreen" value="screen" />
+ <preference name="xwalkVersion" value="18+" />
+ <preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect" />
+ <preference name="xwalkMode" value="embedded" />
+ <preference name="xwalkMultipleApk" value="true" />
+ <preference name="Orientation" value="portrait" />
+ <feature name="StatusBar">
+ <param name="ios-package" onload="true" value="CDVStatusBar" />
+ </feature>
+ <plugin name="cordova-plugin-console" spec="~1.0.3" />
+ <plugin name="cordova-plugin-whitelist" spec="~1.2.2" />
+ <plugin name="cordova-plugin-splashscreen" spec="~3.2.2" />
+ <plugin name="cordova-plugin-statusbar" spec="~2.1.3" />
+ <plugin name="ionic-plugin-keyboard" spec="~2.2.1" />
+ <plugin name="cordova-plugin-firebase" spec="~0.1.18" />
+ <plugin name="cordova-plugin-device" spec="~1.1.3" />
+ <plugin name="cordova-plugin-file-transfer" spec="~1.6.1" />
+ <plugin name="cordova-plugin-inapppurchase" spec="~1.1.0" />
+ <plugin name="cordova-plugin-x-toast" spec="https://github.com/EddyVerbruggen/Toast-PhoneGap-Plugin.git" />
+ <plugin name="cordova-plugin-badge" spec="https://github.com/katzer/cordova-plugin-badge.git" />
+ <plugin name="cordova-plugin-facebook4" spec="~1.7.4">
+ <variable name="APP_ID" value="1830882820517971" />
+ <variable name="APP_NAME" value="Betskills" />
+ </plugin>
+ <plugin name="com.jcjee.plugins.emailcomposer" spec="https://github.com/jcjee/email-composer.git" />
+ <platform name="ios">
+ <access origin="cdvfile://*" />
+ <allow-intent href="cdvfile://*" />
+ <allow-intent href="fb://*" />
+ <allow-intent href="twitter://*" />
+ <allow-intent href="instagram://*" />
+ <allow-intent href="http://*" />
+ <allow-intent href="https://*" />
+ <preference name="iosPersistentFileLocation" value="Library" />
+ <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
+ <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
+ <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
+ <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
+ <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" />
+ <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
+ <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
+ <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
+ <icon height="57" src="resources/ios/icon/icon.png" width="57" />
+ <icon height="114" src="resources/ios/icon/icon@2x.png" width="114" />
+ <icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
+ <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80" />
+ <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120" />
+ <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
+ <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100" />
+ <icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
+ <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120" />
+ <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180" />
+ <icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
+ <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144" />
+ <icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
+ <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152" />
+ <icon height="167" src="resources/ios/icon/icon-83.5@2x.png" width="167" />
+ <icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
+ <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58" />
+ <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87" />
+ </platform>
+ <platform name="android">
+ <preference name="android-minSdkVersion" value="23" />
+ <preference name="android-targetSdkVersion" value="23" />
+ <preference name="SplashMaintainAspectRatio" value="true" />
+ <preference name="SplashShowOnlyFirstTime" value="false" />
+ <preference name="AndroidPersistentFileLocation" value="Compatibility" />
+ <preference name="android-build-tool" value="gradle" />
+ <access origin="cdvfile://*" />
+ <allow-intent href="cdvfile://*" />
+ <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
+ <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
+ <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
+ <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
+ <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
+ <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
+ <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
+ <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
+ <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
+ <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
+ <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
+ <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
+ </platform>
+ <icon src="resources/android/icon/drawable-xhdpi-icon.png" />
</widget>
diff --git a/www/js/modules/notification/service.js b/www/js/modules/notification/service.js
index c733589c6aca66ca35e123b707b45644ba2db1ae..e5124b1b7b7ee550a3b9cdf975bd86044d41cfe6 100644
--- a/www/js/modules/notification/service.js
+++ b/www/js/modules/notification/service.js
@@ -28,22 +28,18 @@
var deviceData = ionic.Platform.device();
deviceData = Object.assign(deviceData, {locale: locale});
- var generatedToken = "";
-
window.FirebasePlugin.getToken(function (token) {
- generatedToken = token;
+ deviceData.token = token;
}, function (error) {
- generatedToken = 'errorGettingToken' + error;
+ deviceData.token = 'errorGettingToken' + error;
});
window.FirebasePlugin.onTokenRefresh(function (token) {
- generatedToken = token;
+ deviceData.token = token;
}, function (error) {
- generatedToken = 'errorGettingRefreshedToken' + error;
+ deviceData.token = 'errorGettingRefreshedToken' + error;
});
- deviceData.token = generatedToken;
-
if (typeof deviceData.token === 'undefined' || deviceData.token == null) {
deviceData.token = 'tokenCannotBeCreated';
}
diff --git a/www/js/pages/football/controller.js b/www/js/pages/football/controller.js
index a5c85fc5929e2875887ffb07ead69896a1f0eb83..d1c1a2964088ac07d3d8dd2336ba6090f8657013 100644
--- a/www/js/pages/football/controller.js
+++ b/www/js/pages/football/controller.js
@@ -93,16 +93,26 @@
var list = angular.element(document.querySelector('#list-packs .list'));
var ionContent = angular.element(document.querySelector('ion-content'))[0];
+ var ionContentObj = angular.element(document.querySelector('ion-content'));
var leagueHeight = angular.element(document.querySelector('.pack-item'))[0].scrollHeight;
+ console.log('toto');
+
if (self.shouldUp && $scope.selected.length > 0) {
list.css('marginBottom', '47px');
+ console.log(ionic.Platform.isIOS());
+ if (ionic.Platform.isIOS()) {
+ ionContentObj.css('marginBottom', '47px');
+ }
} else if (self.shouldUp && $scope.selected.length == 0) {
list.css('marginBottom', '0');
+ if (ionic.Platform.isIOS()) {
+ ionContentObj.css('marginBottom', '0');
+ }
}
if (self.shouldUp && $scope.selected.length > 0) {
- ionContent.scrollTop = ionContent.scrollHeight;
+ ionContent.scrollTop = ionContent.scrollHeight + 50;
}
var price = self.findPrice($scope.selected.length);
@@ -294,7 +304,7 @@
$scope.freePredictions = freePredictions;
$scope.leagues = data[1]['data'];
- if ($scope.leagues.length >= 3) {
+ if ($scope.leagues.length >= 2) {
self.shouldUp = true;
}