diff --git a/bower.json b/bower.json index 84b652710436d42ceefc0029041fa1989c49f6a7..e2f5ef6f15b2013837ed01ad8e6a8581add0ea05 100644 --- a/bower.json +++ b/bower.json @@ -14,7 +14,7 @@ "ionic-img-cache": "^1.1.1" }, "devDependencies": { - "platform.js": "platform#^1.3.1", + "platform.js": "platform#^1.3.3", "ionic-platform-web-client": "^0.7.1" } } diff --git a/package.json b/package.json index 84d317616117bdb743cd8f76a99d4a5ca3e167c8..20f14832f0807e93220b2e90905732c4591e9f20 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "dependencies": { "gulp": "^3.5.6", "gulp-concat": "^2.2.0", + "gulp-filter": "^5.0.0", "gulp-minify-css": "^0.3.0", "gulp-rename": "^1.2.0", "gulp-sass": "^2.0.4" diff --git a/scss/notification.scss b/scss/notification.scss index f9388d6442e034338bf72ccdb03b7cab0582fbbe..d80101c8b906f77cd1c9ff2a36c50cdfef592458 100644 --- a/scss/notification.scss +++ b/scss/notification.scss @@ -38,6 +38,7 @@ font-size: 17px; color: $blackColor; text-align: justify; + white-space: initial; } .info-button { diff --git a/www/js/app.js b/www/js/app.js index e84fcc2a95c33a2adf16e0cd42e23508813c8da9..5970383ed3bebd990cfb69c7acc3b7b01603ab42 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -20,7 +20,7 @@ "facebook_link": "fb://page/1964315240459744", "twitter_link": "https://twitter.com/betskills", "instagram_link": "instagram://user?username=betskills", - "daily_predictions": "Daily Predictions", + "daily_predictions": "Weekly Predictions", "all_predictions": "All the predictions", "unlock": "Unlock", "predictions": "Predictions", @@ -48,7 +48,7 @@ "facebook_link": "fb://page/1757105857849857", "twitter_link": "https://twitter.com/betskills_fr", "instagram_link": "instagram://user?username=betskills_fr", - "daily_predictions": "Prédictions gratuites", + "daily_predictions": "Prédictions de la semaine", "all_predictions": "Toutes les prédictions", "unlock": "Dévérouiller", "predictions": "Prédictions", diff --git a/www/js/pages/notifications/controller.js b/www/js/pages/notifications/controller.js index 2b3b42118e26a65bfb7e6a6d21b7ed76b950754e..44ba951c1932e688e05f55ec46b89be728a82699 100644 --- a/www/js/pages/notifications/controller.js +++ b/www/js/pages/notifications/controller.js @@ -96,7 +96,10 @@ $scope.$on("$ionicView.beforeEnter", function(event, data){ // Each time we open the notification page, we clean the badge - window.FirebasePlugin.setBadgeNumber(0); + + if (window.cordova) { + window.FirebasePlugin.setBadgeNumber(0); + } $ionicLoading.show({ template: '<ion-spinner icon="ripple" class="spinner-assertive"></ion-spinner>', diff --git a/www/js/pages/notifications/template.html b/www/js/pages/notifications/template.html index f9c2cf2b977245acd96faf164dc62ffea497a561..299727336b251a8cdacda31256338847e93513d5 100644 --- a/www/js/pages/notifications/template.html +++ b/www/js/pages/notifications/template.html @@ -1,6 +1,6 @@ <ion-view cache-view="true" title="Notifications"> <ion-nav-buttons side="right"> - <img ui-sref="info" class="info-icon" src="img/info.png" alt="info"> + <img ui-sref="info" class="info-icon infobulle" src="img/info.png" alt="info"> </ion-nav-buttons> <ion-content class="has-header"> <ion-list> diff --git a/www/manifest.json b/www/manifest.json index 2a304943137a38471b90d4397c9d4aa198aa4c4c..51622d60bfe09e5c6725cf6a722b2495fcd858ef 100644 --- a/www/manifest.json +++ b/www/manifest.json @@ -1,6 +1,4 @@ { "play_store_key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs06saHKaKvyRbwiZOtg9sTM0nn8q3cjoQbVJK0jOEDDG9q4cB852cYYROBYDFwUCM0Yz2oSOZ0SBEVBpUxDcMu9tasH9EekLbjBSC15bLJIx44mqsWL1CkOo/Z19B81IITJ7v7Hz3adst5PAvi5OgZiJSrlEMJlKPrQwSFy9do6NeVwixxbdWlzbf8fcLL2RTiQgJVt7+SGzgjgaiGjGGZRN1sYKhIk8k6vgj7pgV1vRM5crVGnnQKf6AIBfkymsfMQTcoUF/StSEBuMOEjHZs/dmYI1GFrdUbFQK/EsLDv6PDUaMYvGKvr8lqdkcEYiKp/BQ7Db7UMuiWUUjtl4QwIDAQAB " -} - -jarsigner -verbose -sigalg SHA256withRSA -keystore ../Resources/key2.jks platforms/android/build/outputs/apk/android-release-unsigned.apk -storepass bruno7707 Testing +} \ No newline at end of file