Skip to content
Snippets Groups Projects
Commit 77f9d7da authored by Jeremy Guiselin's avatar Jeremy Guiselin
Browse files

New fix wave + keystore

parent fad47a8a
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 161 additions and 133 deletions
config.xml
+ 93
− 93
View file @ 77f9d7da
<?xml version='1.0' encoding='utf-8'?>
<?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">
<name>Betskills</name>
<description>
......@@ -40,28 +40,11 @@
<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"/>
<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" />
<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"/>
......@@ -70,6 +53,24 @@
<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 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"/>
......@@ -80,19 +81,18 @@
<preference name="android-build-tool" value="gradle"/>
<access origin="cdvfile://*"/>
<allow-intent href="cdvfile://*"/>
<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" />
<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 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"/>
<plugin name="com.jcjee.plugins.emailcomposer" spec="https://github.com/jcjee/email-composer.git" />
</widget>
\ No newline at end of file
key2.jks 0 → 100644
+ 0
− 0
View file @ 77f9d7da
File added
resources/icon.png
+ 0
− 0
View replaced file @ fad47a8a View file @ 77f9d7da
resources/icon.png

15 KiB | W: | H:

resources/icon.png

272 KiB | W: | H:

resources/icon.png
resources/icon.png
resources/icon.png
resources/icon.png
  • 2-up
  • Swipe
  • Onion skin
scss/unlock.scss
+ 11
− 4
View file @ 77f9d7da
......@@ -6,7 +6,7 @@
width: 100%;
text-align: center;
z-index: 7;
padding: 20px;
padding: 5px;
height: 100px;
&.active {
......@@ -19,14 +19,21 @@
.content {
border: 3px solid #fff;
border-radius: 20px;
width: 90%;
width: 98%;
max-width: 330px;
margin: auto;
text-align: left;
padding: 10px;
text-transform: uppercase;
color: $whiteColor;
font-family: "OspDin";
font-size: 20px;
box-shadow: 0px 2px 1px black;
font-size: 25px;
box-shadow: 0px 3px 1px black;
span {
position: absolute;
right: 0;
margin-right: 10px;
}
}
}
www/img/lock.png
+ 0
− 0
View replaced file @ fad47a8a View file @ 77f9d7da
www/img/lock.png

776 B | W: | H:

www/img/lock.png

1.14 KiB | W: | H:

www/img/lock.png
www/img/lock.png
www/img/lock.png
www/img/lock.png
  • 2-up
  • Swipe
  • Onion skin
www/js/app.js
+ 1
− 0
View file @ 77f9d7da
......@@ -93,6 +93,7 @@
if (ionic.Platform.isIOS()) {
window.FirebasePlugin.grantPermission();
}
ionic.Platform.ready(function () {
constantConfig.uuid = window.cordova ? ionic.Platform.device().uuid : '7f4a6a40e5c87157';
});
......
www/js/modules/config/config.js
+ 4
− 3
View file @ 77f9d7da
......@@ -20,9 +20,10 @@
'push': {
'sender_id': '1006878207346',
'pluginConfig': {
'ios': {
'badge': true,
'sound': true
ios: {
alert: "true",
badge: "true",
sound: "true"
},
'android': {
'iconColor': '#000000'
......
www/js/modules/notification/service.js
+ 35
− 24
View file @ 77f9d7da
......@@ -11,7 +11,7 @@
* @ngInject
*/
function NotificationService($http, constantConfig) {
var service = {
return {
registerDevice: function () {
......@@ -20,33 +20,26 @@
locale = 'en';
}
var self = this;
ionic.Platform.ready(function () {
var deviceData = {};
if (window.cordova) {
var device = ionic.Platform.device();
deviceData = device;
var tokenAlreadyCreated = false;
window.FirebasePlugin.getToken(function (token) {
deviceData = Object.assign(device, {'locale': locale, 'token': token});
tokenAlreadyCreated = true;
}, function (error) {
console.log(error);
debugger;
deviceData = Object.assign(device, {'locale': locale, 'token': 'tokenCannotBeCreated'});
});
var deviceData = ionic.Platform.device();
deviceData = Object.assign(deviceData, {locale: locale});
if (!tokenAlreadyCreated) {
window.FirebasePlugin.onTokenRefresh(function (token) {
deviceData = Object.assign(device, {'locale': locale, 'token': token});
}, function (error) {
console.log(error);
debugger;
deviceData = Object.assign(device, {'locale': locale, 'token': 'tokenCannotBeCreated'});
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();
}
if (typeof deviceData.token === 'undefined' || deviceData.token == null) {
deviceData.locale = locale;
deviceData.token = 'tokenCannotBeCreated';
}
......@@ -58,7 +51,8 @@
model: 'AquarisE5',
uuid: '7f4a6a40e5c87157',
locale: locale,
token: 'cNgyx3ZgOX4:APA91bF5eigDuJLjj8wI8SC4l5KIHATuxi-2G5whpWI1n1jWpWWwRAwbEXec4fQ2S7HW8EdUPaREXJ5fVd_TZV8rZq_eIJIEhEadeH9wpsbYmUUM7E8H8Y0Qst9KmBuHWodCFFJPJ0vh'
token: 'cNgyx3ZgOX4:APA91bF5eigDuJLjj8wI8SC4l5KIHATuxi-2G5whpWI1n1jWpWWwRAwbEXec4fQ2S7HW8EdUPaREXJ' +
'5fVd_TZV8rZq_eIJIEhEadeH9wpsbYmUUM7E8H8Y0Qst9KmBuHWodCFFJPJ0vh'
}
}
$http.post(constantConfig.apiUrl + 'devices/register', deviceData)
......@@ -66,10 +60,27 @@
}, 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;
}
};
return service;
};
}
......
www/js/pages/football/controller.js
+ 10
− 6
View file @ 77f9d7da
......@@ -141,6 +141,9 @@
};
$scope.parseDate = function (date) {
if (typeof date === 'undefined' || date == "") {
return "";
} else {
var locale = window.navigator.language.split('-')[0];
date = date.split(' ')[0].split('-');
......@@ -149,6 +152,7 @@
} else {
return date[1] + '/' + date[2] + '/' + date[0].substr(-2);
}
}
};
/**
......
www/js/pages/info/template.html
+ 3
− 3
View file @ 77f9d7da
......@@ -8,15 +8,15 @@
<ion-content class="has-header info">
<h3 class="title-section" translate="info_title_1"></h3>
<div class="social-networks">
<a ng-href='{{"instagram_link"|translate}}' onclick="window.open(this.href, '_system', 'location=yes'); return false;">
<a ng-href='{{"instagram_link"|translate}}' onclick="window.open(this.href, '_system', 'location=yes');">
<img src="img/instagram.png">
<p>Instagram</p>
</a>
<a ng-href='{{"facebook_link"|translate}}' onclick="window.open(this.href, '_system', 'location=yes'); return false;">
<a ng-href='{{"facebook_link"|translate}}' onclick="window.open(this.href, '_system', 'location=yes');">
<img src="img/facebook.png">
<p>Facebook</p>
</a>
<a ng-href='{{"twitter_link"|translate}}' onclick="window.open(this.href, '_system', 'location=yes'); return false;">
<a ng-href='{{"twitter_link"|translate}}' onclick="window.open(this.href, '_system', 'location=yes');">
<img src="img/twitter.png">
<p>Twitter</p>
</a>
......
www/js/pages/notifications/controller.js
+ 4
− 0
View file @ 77f9d7da
......@@ -94,6 +94,10 @@
});
$scope.$on("$ionicView.beforeEnter", function(event, data){
// Each time we open the notification page, we clean the badge
window.FirebasePlugin.setBadgeNumber(0);
$ionicLoading.show({
template: '<ion-spinner icon="ripple" class="spinner-assertive"></ion-spinner>',
animation: 'fade-in',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment