From 6bfcf8e874399905531ca0d3993e0239ab737969 Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Thu, 22 Sep 2016 15:36:44 -0400
Subject: [PATCH] added color names

---
 public/views/preferencesColor.html       |  5 +++--
 public/views/preferencesInformation.html |  2 +-
 src/js/controllers/preferencesColor.js   | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/public/views/preferencesColor.html b/public/views/preferencesColor.html
index 87c54639f..b7c5324d2 100644
--- a/public/views/preferencesColor.html
+++ b/public/views/preferencesColor.html
@@ -7,8 +7,9 @@
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content>
-    <ion-radio ng-repeat="c in colorList" ng-value="c" ng-model="currentColor" ng-click="save(c)">
-      <span ng-style="{'color': c}">&block;</span>
+    <ion-radio ng-repeat="c in colorList" ng-value="c.color" ng-model="currentColor" ng-click="save(c)">
+      <span ng-style="{'color': c.color}">&block;</span>
+      <span> {{c.name}}</span>
     </ion-radio>
   </ion-content>
 </ion-view>
diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html
index 9dc8b42aa..1e222374f 100644
--- a/public/views/preferencesInformation.html
+++ b/public/views/preferencesInformation.html
@@ -1,4 +1,4 @@
-<ion-view>
+<ion-view class="settings">
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Wallet Information' | translate}}</ion-nav-title>
     <ion-nav-back-button>
diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js
index 04ccc3cdd..ebb881b77 100644
--- a/src/js/controllers/preferencesColor.js
+++ b/src/js/controllers/preferencesColor.js
@@ -17,6 +17,22 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
         '#FF599E',
         '#7A8C9E',
       ];
+      $scope.colorList = [
+        {color: "#DD4B39", name: "Cinnabar"},
+        {color: "#F38F12", name: "Carrot Orange"},
+        {color: "#FAA77F", name: "Light Salmon"},
+        {color: "#D0B136", name: "Metallic Gold"},
+        {color: "#9EDD72", name: "Feijoa"},
+        {color: "#29BB9C", name: "Shamrock"},
+        {color: "#019477", name: "Observatory"},
+        {color: "#77DADA", name: "Turquoise Blue"},
+        {color: "#4A90E2", name: "Cornflower Blue"},
+        {color: "#484ED3", name: "Free Speech Blue"},
+        {color: "#9B59B6", name: "Deep Lilac"},
+        {color: "#E856EF", name: "Free Speech Magenta"},
+        {color: "#FF599E", name: "Brilliant Rose"},
+        {color: "#7A8C9E", name: "Light Slate Grey"}
+      ];
 
   var wallet = profileService.getWallet($stateParams.walletId);
   $scope.wallet = wallet;