From 5b7aca2fe06b75dfce3f208c24fbe42bad01ae00 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Thu, 7 Apr 2016 12:34:12 +0200
Subject: [PATCH] Switch config to super_currency + add ios platform
---
app/config.json | 6 +--
config.xml | 37 +++++++++++++++----
package.json | 3 +-
www/js/config.js | 3 +-
www/js/controllers/currency-controllers.js | 4 +-
www/js/services/wallet-services.js | 2 +-
.../explore/tabs/explore_tab_currency.html | 4 +-
7 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/app/config.json b/app/config.json
index 0f098e97f..3e7040179 100644
--- a/app/config.json
+++ b/app/config.json
@@ -19,16 +19,14 @@
"ucoin-fr": {
"APP_CONFIG": {
- "UCOIN_NODE": "metab.ucoin.fr",
- "UCOIN_NODE_WS": "metab.ucoin.fr:9201",
+ "UCOIN_NODE": "twiced.fr:9330",
"UCOIN_NODE_ES": "es.ucoin.fr"
}
},
"dev": {
"APP_CONFIG": {
- "UCOIN_NODE": "192.168.0.5:9201",
- "UCOIN_NODE_WS": "192.168.0.5:9201",
+ "UCOIN_NODE": "twiced.fr:9330",
"UCOIN_NODE_ES": "192.168.0.5:9200"
}
}
diff --git a/config.xml b/config.xml
index d015970d8..3a91ad31c 100644
--- a/config.xml
+++ b/config.xml
@@ -39,10 +39,33 @@
<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"/>
</platform>
-
- <!-- A wildcard can be used to whitelist the entire network,
- over HTTP and HTTPS.
- *NOT RECOMMENDED* - see https://github.com/apache/cordova-plugin-whitelist
- -->
- <allow-navigation href="*" />
-</widget>
+ <platform name="ios">
+ <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-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-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 src="resources/ios/splash/Default-568h@2x~iphone.png" height="1136" width="640"/>
+ <splash src="resources/ios/splash/Default-667h.png" height="1334" width="750"/>
+ <splash src="resources/ios/splash/Default-736h.png" height="2208" width="1242"/>
+ <splash src="resources/ios/splash/Default-Landscape-736h.png" height="1242" width="2208"/>
+ <splash src="resources/ios/splash/Default-Landscape@2x~ipad.png" height="1536" width="2048"/>
+ <splash src="resources/ios/splash/Default-Landscape~ipad.png" height="768" width="1024"/>
+ <splash src="resources/ios/splash/Default-Portrait@2x~ipad.png" height="2048" width="1536"/>
+ <splash src="resources/ios/splash/Default-Portrait~ipad.png" height="1024" width="768"/>
+ <splash src="resources/ios/splash/Default@2x~iphone.png" height="960" width="640"/>
+ <splash src="resources/ios/splash/Default~iphone.png" height="480" width="320"/>
+ </platform>
+ <allow-navigation href="*"/>
+</widget>
\ No newline at end of file
diff --git a/package.json b/package.json
index 0636f959d..cff1ef72b 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
"cordova-plugin-device"
],
"cordovaPlatforms": [
- "android"
+ "android",
+ "ios"
]
}
diff --git a/www/js/config.js b/www/js/config.js
index 9417b3aca..ed674fbca 100644
--- a/www/js/config.js
+++ b/www/js/config.js
@@ -10,8 +10,9 @@ angular.module("cesium.config", [])
.constant("APP_CONFIG", {
"UCOIN_NODE": "twiced.fr:9330",
+ "UCOIN_NODE_ES": "es.ucoin.fr",
"VERSION": "0.0.1",
- "BUILD_DATE": "2016-04-06T17:25:44.944Z"
+ "BUILD_DATE": "2016-04-07T10:31:33.206Z"
})
;
\ No newline at end of file
diff --git a/www/js/controllers/currency-controllers.js b/www/js/controllers/currency-controllers.js
index 7c8bed42b..c8c997adf 100644
--- a/www/js/controllers/currency-controllers.js
+++ b/www/js/controllers/currency-controllers.js
@@ -46,7 +46,7 @@ angular.module('cesium.currency.controllers', ['cesium.services'])
function CurrenciesController($scope, $state) {
$scope.selectedCurrency = '';
- $scope.knownCurrencies = ['meta_brouzouf'];
+ $scope.knownCurrencies = ['super_currency'];
// Called to navigate to the main app
$scope.selectCurrency = function(currency) {
@@ -66,7 +66,7 @@ function ExploreController($scope, $rootScope, $state, BMA, $q, UIUtils, $interv
$scope.accountTypeMember = null;
$scope.accounts = [];
$scope.search = { text: '', results: {} };
- $scope.knownCurrencies = ['meta_brouzouf'];
+ $scope.knownCurrencies = ['super_currency'];
$scope.formData = { useRelative: false };
$scope.knownBlocks = [];
$scope.entered = false;
diff --git a/www/js/services/wallet-services.js b/www/js/services/wallet-services.js
index 817b6e455..dca10a581 100644
--- a/www/js/services/wallet-services.js
+++ b/www/js/services/wallet-services.js
@@ -346,7 +346,7 @@ angular.module('cesium.wallet.services', ['ngResource', 'cesium.bma.services', '
}
if (sourceAmount < amount) {
- reject('Not enought sources (max amount: '
+ reject('Not enough sources (max amount: '
+(data.useRelative ? (sourceAmount / data.currentUD)+' UD' : sourceAmount)
+'). Please wait next block computation.');
return;
diff --git a/www/templates/explore/tabs/explore_tab_currency.html b/www/templates/explore/tabs/explore_tab_currency.html
index eac77ffd5..e453f4dec 100644
--- a/www/templates/explore/tabs/explore_tab_currency.html
+++ b/www/templates/explore/tabs/explore_tab_currency.html
@@ -4,7 +4,7 @@
<a href="#" class="item item-icon-left">
<i class="icon ion-android-bookmark"></i>
<span translate>CURRENCY.VIEW.CURRENCY_NAME</span>
- <span class="item-note">{{selectedCurrency}} meta_brouzouf ({{unit | abbreviate}}<sub>{{udUnit | abbreviate}}</sub>)</span>
+ <span class="item-note">{{selectedCurrency}} super_currency ({{unit | abbreviate}}<sub>{{udUnit | abbreviate}}</sub>)</span>
</a>
<a class="item item-icon-left" href="#">
@@ -90,4 +90,4 @@
<span translate>CURRENCY.VIEW.UD</span>
<span class="item-note">MAX(UD<sub>t-1</sub>, c*M/N)</span>
</a>
- </div>
\ No newline at end of file
+ </div>
--
GitLab