Skip to content
Snippets Groups Projects
Commit efc80fef authored by Jérémy Guiselin's avatar Jérémy Guiselin
Browse files

fix

parent 55de92cf
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
config.xml
+ 97
− 92
View file @ efc80fef
<?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>
......@@ -44,33 +44,38 @@
<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 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"/>
<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" />
......@@ -81,18 +86,18 @@
<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"/>
<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>
www/js/modules/notification/service.js
+ 4
− 8
View file @ efc80fef
......@@ -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';
}
......
www/js/pages/football/controller.js
+ 12
− 2
View file @ efc80fef
......@@ -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;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment