Move to new colors, switch incoming/outgoing colors

js/background.js

@@ -768,7 +768,6 @@
     if (firstRun === true && deviceId !== '1') {
       const hasThemeSetting = Boolean(storage.get('theme-setting'));
       if (!hasThemeSetting && textsecure.storage.get('userAgent') === 'OWI') {
-        storage.put('theme-setting', 'ios');
         onChangeTheme();
       }
       const syncRequest = new textsecure.SyncRequest(
@@ -961,6 +960,7 @@
     const updates = {
       name: details.name,
       members: details.members,
+      color: details.color,
       type: 'group',
     };
 

js/models/conversations.js

@@ -37,19 +37,15 @@
 
   const COLORS = [
     'red',
+    'deep_orange',
+    'brown',
     'pink',
     'purple',
-    'deep_purple',
     'indigo',
     'blue',
-    'light_blue',
-    'cyan',
     'teal',
     'green',
     'light_green',
-    'orange',
-    'deep_orange',
-    'amber',
     'blue_grey',
   ];
 

js/models/messages.js

@@ -394,7 +394,6 @@
       const contact = this.findAndFormatContact(phoneNumber);
       const contactModel = this.findContact(phoneNumber);
 
-      const authorColor = contactModel ? contactModel.getColor() : null;
       const authorAvatar = contactModel ? contactModel.getAvatar() : null;
       const authorAvatarPath = authorAvatar ? authorAvatar.url : null;
 
@@ -407,6 +406,7 @@
 
       const conversation = this.getConversation();
       const isGroup = conversation && !conversation.isPrivate();
+      const conversationColor = conversation && conversation.getColor();
 
       const attachments = this.get('attachments');
       const firstAttachment = attachments && attachments[0];
@@ -421,7 +421,7 @@
         authorName: contact.name,
         authorProfileName: contact.profileName,
         authorPhoneNumber: contact.phoneNumber,
-        authorColor,
+        conversationColor,
         conversationType: isGroup ? 'group' : 'direct',
         attachment: this.getPropsForAttachment(firstAttachment),
         quote: this.getPropsForQuote(),
@@ -536,7 +536,6 @@
       const authorPhoneNumber = author;
       const authorProfileName = contact ? contact.getProfileName() : null;
       const authorName = contact ? contact.getName() : null;
-      const authorColor = contact ? contact.getColor() : 'grey';
       const isFromMe = contact ? contact.id === this.OUR_NUMBER : false;
       const onClick = () => {
         this.trigger('scroll-to-message', {
@@ -557,7 +556,6 @@
         authorPhoneNumber,
         authorProfileName,
         authorName,
-        authorColor,
         onClick,
         referencedMessageNotFound,
       };

js/views/app_view.js

@@ -21,18 +21,11 @@
       openInbox: 'openInbox',
     },
     applyTheme() {
-      const iOS = storage.get('userAgent') === 'OWI';
       const theme = storage.get('theme-setting') || 'light';
       this.$el
         .removeClass('light-theme')
         .removeClass('dark-theme')
         .addClass(`${theme}-theme`);
-
-      if (iOS) {
-        this.$el.addClass('ios-theme');
-      } else {
-        this.$el.removeClass('ios-theme');
-      }
     },
     applyHideMenu() {
       const hideMenuBar = storage.get('hide-menu-bar', false);

js/views/identicon_svg_view.js

@@ -42,20 +42,17 @@
   });
 
   const COLORS = {
-    red: '#EF5350',
-    pink: '#EC407A',
-    purple: '#AB47BC',
-    deep_purple: '#7E57C2',
-    indigo: '#5C6BC0',
-    blue: '#2196F3',
-    light_blue: '#03A9F4',
-    cyan: '#00BCD4',
-    teal: '#009688',
-    green: '#4CAF50',
-    light_green: '#7CB342',
-    orange: '#FF9800',
-    deep_orange: '#FF5722',
-    amber: '#FFB300',
-    blue_grey: '#607D8B',
+    red: '#cc163d',
+    deep_orange: '#c73800',
+    brown: '#746c53',
+    pink: '#a23474',
+    purple: '#862caf',
+    indigo: '#5951c8',
+    blue: '#336ba3',
+    teal: '#067589',
+    green: '#3b7845',
+    light_green: '#895d66',
+    blue_grey: '#607d8b',
+    grey: '#6b6b78',
   };
 })();