diff --git a/config.xml b/config.xml
index 0136594aea5faa0da6b671bbc509e5923537352b..28c72dacda27daa8db6a1fce2312f2271b208cc1 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.Dimago.Betskills" version="2.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<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>
Betskills app to see predictions of football and tennis games.
@@ -44,6 +44,15 @@
<platform name="ios">
<access origin="cdvfile://*"/>
<allow-intent href="cdvfile://*"/>
+ <access origin="fb:*" />
+ <allow-intent href="fb:*" />
+ <access origin="instagram:*" />
+ <allow-intent href="instagram:*" />
+ <access origin="mailto:*" />
+ <allow-intent href="mailto:*" />
+ <allow-navigation href="mailto:*" />
+ <allow-navigation href="fb:*" />
+ <allow-navigation href="instagram:*" />
<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"/>
@@ -81,6 +90,15 @@
<preference name="android-build-tool" value="gradle"/>
<access origin="cdvfile://*"/>
<allow-intent href="cdvfile://*"/>
+ <access origin="fb:*" />
+ <allow-intent href="fb:*" />
+ <access origin="instagram:*" />
+ <allow-intent href="instagram:*" />
+ <access origin="mailto:*" />
+ <allow-intent href="mailto:*" />
+ <allow-navigation href="mailto:*" />
+ <allow-navigation href="fb:*" />
+ <allow-navigation href="instagram:*" />
<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"/>
diff --git a/www/img/lock.png b/www/img/lock.png
index 5336e4c60967b53f976c8d3379999c68685704a5..b20c048cf349ac6a8cf430def9385d6030e6bdb8 100644
Binary files a/www/img/lock.png and b/www/img/lock.png differ
diff --git a/www/js/modules/notification/service.js b/www/js/modules/notification/service.js
index bf7b2c28c7028ace747587a74760089d7e797281..c733589c6aca66ca35e123b707b45644ba2db1ae 100644
--- a/www/js/modules/notification/service.js
+++ b/www/js/modules/notification/service.js
@@ -24,20 +24,25 @@
ionic.Platform.ready(function () {
if (window.cordova) {
+
var deviceData = ionic.Platform.device();
deviceData = Object.assign(deviceData, {locale: locale});
- if (ionic.Platform.isIOS()) {
- window.FirebasePlugin.hasPermission(function(data){
- if (data.isEnabled) {
- deviceData.token = self.fetchToken();
- } else {
- deviceData.token = 'notAllowedToGetToken';
- }
- });
- } else {
- deviceData.token = self.fetchToken();
- }
+ var generatedToken = "";
+
+ window.FirebasePlugin.getToken(function (token) {
+ generatedToken = token;
+ }, function (error) {
+ generatedToken = 'errorGettingToken' + error;
+ });
+
+ window.FirebasePlugin.onTokenRefresh(function (token) {
+ generatedToken = token;
+ }, function (error) {
+ generatedToken = 'errorGettingRefreshedToken' + error;
+ });
+
+ deviceData.token = generatedToken;
if (typeof deviceData.token === 'undefined' || deviceData.token == null) {
deviceData.token = 'tokenCannotBeCreated';
@@ -60,24 +65,6 @@
}, function errorCallback() {
});
});
- },
-
- fetchToken: function () {
- var generatedToken = "";
-
- window.FirebasePlugin.getToken(function (token) {
- generatedToken = token;
- }, function (error) {
- generatedToken = 'errorGettingToken' + error;
- });
-
- window.FirebasePlugin.onTokenRefresh(function (token) {
- generatedToken = token;
- }, function (error) {
- generatedToken = 'errorGettingRefreshedToken' + error;
- });
-
- return generatedToken;
}
};
diff --git a/www/js/pages/football/controller.js b/www/js/pages/football/controller.js
index b5a7b642a503fedc57f7d594e4ae4fd2aa30fa3e..a5c85fc5929e2875887ffb07ead69896a1f0eb83 100644
--- a/www/js/pages/football/controller.js
+++ b/www/js/pages/football/controller.js
@@ -81,21 +81,29 @@
if (!$scope.isBought(league.id)) {
if ($scope.selected.indexOf(league) !== -1) {
$scope.selected.splice($scope.selected.indexOf(league), 1);
- $scope.predictionsNumber -= league.predictions_number;
+ if (league.predictions_number) {
+ $scope.predictionsNumber -= league.predictions_number;
+ }
} else {
$scope.selected.push(league);
- $scope.predictionsNumber += league.predictions_number;
+ if (league.predictions_number) {
+ $scope.predictionsNumber += league.predictions_number;
+ }
}
var list = angular.element(document.querySelector('#list-packs .list'));
var ionContent = angular.element(document.querySelector('ion-content'))[0];
+ var leagueHeight = angular.element(document.querySelector('.pack-item'))[0].scrollHeight;
if (self.shouldUp && $scope.selected.length > 0) {
- list.css('marginBottom', '50px');
- ionContent.scrollTop = ionContent.scrollHeight;
+ list.css('marginBottom', '47px');
} else if (self.shouldUp && $scope.selected.length == 0) {
list.css('marginBottom', '0');
}
+
+ if (self.shouldUp && $scope.selected.length > 0) {
+ ionContent.scrollTop = ionContent.scrollHeight;
+ }
var price = self.findPrice($scope.selected.length);
$scope.price = price;
diff --git a/www/js/pages/tennis/controller.js b/www/js/pages/tennis/controller.js
index 8bc25f9324c63c4490de1d5f68a7ae35a23fb236..806d17e46b6b2cd6b5bdba963f7a81ffdb001bae 100644
--- a/www/js/pages/tennis/controller.js
+++ b/www/js/pages/tennis/controller.js
@@ -79,10 +79,14 @@
if (!$scope.isBought(league.id)) {
if ($scope.selected.indexOf(league) !== -1) {
$scope.selected.splice($scope.selected.indexOf(league), 1);
- $scope.predictionsNumber -= league.predictions_number;
+ if (league.predictions_number) {
+ $scope.predictionsNumber -= league.predictions_number;
+ }
} else {
$scope.selected.push(league);
- $scope.predictionsNumber += league.predictions_number;
+ if (league.predictions_number) {
+ $scope.predictionsNumber += league.predictions_number;
+ }
}
var list = angular.element(document.querySelector('#list-packs .list'));