Update brand logo and colors

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt

@@ -67,12 +67,6 @@ class DonationReceiptDetailFragment : DSLSettingsFragment(layoutId = R.layout.do
 
   private fun getConfiguration(record: InAppPaymentReceiptRecord, subscriptionName: String?): DSLConfiguration {
     return configure {
-      customPref(
-        SplashImage.Model(
-          splashImageResId = R.drawable.ic_molly_logo
-        )
-      )
-
       textPref(
         title = DSLSettingsText.from(
           charSequence = FiatMoneyUtil.format(resources, record.amount),

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/UsernameQrCodeColorScheme.kt

@@ -14,9 +14,10 @@ enum class UsernameQrCodeColorScheme(
   private val key: String
 ) {
   Blue(
-    borderColor = Color(0xFF506ECD),
-    foregroundColor = Color(0xFF2449C0),
-    backgroundColor = Color(0xFFEDF0FA),
+    // MOLLY: Blue is the new Purple
+    borderColor = Color(0xFF7152FF),
+    foregroundColor = Color(0xFF5335DD),
+    backgroundColor = Color(0xFFEAE5FF),
     key = "blue"
   ),
   White(
@@ -58,9 +59,10 @@ enum class UsernameQrCodeColorScheme(
     key = "pink"
   ),
   Purple(
-    borderColor = Color(0xFF9E7BE9),
-    foregroundColor = Color(0xFF7651C5),
-    backgroundColor = Color(0xFFF5F3FA),
+    // MOLLY: Purple is upstream Blue (CD->CC to avoid replace conflicts)
+    borderColor = Color(0xFF506ECC),
+    foregroundColor = Color(0xFF2449C0),
+    backgroundColor = Color(0xFFEDF0FA),
     key = "purple"
   );
 

app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColorsPalette.kt

@@ -11,7 +11,7 @@ object ChatColorsPalette {
     @JvmField
     val ULTRAMARINE = ChatColors.forColor(
       ChatColors.Id.BuiltIn,
-      0xFF5F4BF1.toInt()
+      0xFF7152FF.toInt()
     )
 
     // endregion

app/src/main/java/org/thoughtcrime/securesms/jobs/CreateReleaseChannelJob.kt

@@ -76,7 +76,7 @@ class CreateReleaseChannelJob private constructor(parameters: Parameters) : Base
     AvatarRenderer.renderAvatar(
       context,
       Avatar.Resource(
-        R.drawable.ic_molly_logo,
+        R.drawable.logo_round_filled,
         Avatars.ColorPair(ContextCompat.getColor(context, R.color.notification_background_ultramarine), ContextCompat.getColor(context, R.color.core_white), "")
       ),
       onAvatarRendered = { media ->

app/src/main/java/org/thoughtcrime/securesms/jobs/LocalArchiveJob.kt

@@ -56,7 +56,7 @@ class LocalArchiveJob internal constructor(parameters: Parameters) : Job(paramet
         context,
         context.getString(R.string.LocalBackupJob_creating_signal_backup),
         NotificationChannels.getInstance().BACKUPS,
-        R.drawable.ic_molly_backup
+        R.drawable.ic_notification_backup
       )
     } catch (e: UnableToStartException) {
       Log.w(TAG, "Unable to start foreground backup service, continuing without service")

app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java

@@ -104,7 +104,7 @@ public void onRun() throws NoExternalStorageException, IOException {
     try (NotificationController notification = GenericForegroundService.startForegroundTask(context,
                                                                      context.getString(R.string.LocalBackupJob_creating_signal_backup),
                                                                      NotificationChannels.getInstance().BACKUPS,
-                                                                     R.drawable.ic_molly_backup))
+                                                                     R.drawable.ic_notification_backup))
     {
       updater.setNotification(notification);
       EventBus.getDefault().register(updater);

app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJobApi29.java

@@ -88,7 +88,7 @@ public void onRun() throws IOException {
       notification = GenericForegroundService.startForegroundTask(context,
                                                                   context.getString(R.string.LocalBackupJob_creating_signal_backup),
                                                                   NotificationChannels.getInstance().BACKUPS,
-                                                                  R.drawable.ic_molly_backup);
+                                                                  R.drawable.ic_notification_backup);
     } catch (UnableToStartException e) {
       Log.w(TAG, "Unable to start foreground backup service, continuing without service");
     }

app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt

@@ -499,7 +499,7 @@ class IncomingMessageObserver(private val context: Application, private val sign
         .setPriority(NotificationCompat.PRIORITY_MIN)
         .setCategory(NotificationCompat.CATEGORY_SERVICE)
         .setWhen(0)
-        .setSmallIcon(R.drawable.ic_molly_background_connection)
+        .setSmallIcon(R.drawable.ic_notification_websocket)
         .build()
       return notification
     }

app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java

@@ -240,7 +240,7 @@ private void foregroundService() {
 
     builder.setContentTitle(getString(R.string.KeyCachingService_passphrase_cached));
     builder.setContentText(getString(R.string.KeyCachingService_signal_passphrase_cached));
-    builder.setSmallIcon(R.drawable.ic_molly_cached);
+    builder.setSmallIcon(R.drawable.ic_notification_unlocked);
     builder.setColor(ContextCompat.getColor(this, R.color.signal_light_colorSecondary));
     builder.setWhen(0);
     builder.setPriority(NotificationCompat.PRIORITY_LOW);

app/src/main/res/drawable-anydpi/ic_notification.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="470"
+    android:viewportHeight="470"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.84249085"
+      android:scaleY="0.84249085"
+      android:translateX="37.014652"
+      android:translateY="37.014652">
+    <path
+        android:pathData="m240.67,0.07c-131.63,-3.1 -239.57,101.28 -240.67,232.95 -0.47,55.96 18.64,107.42 50.87,148l-29.05,50.8c-9.72,17.01 2.56,38.19 22.17,38.19h189.07c130.71,0 238.36,-106.96 236.91,-237.66 -1.4,-126.67 -103.02,-229.28 -229.31,-232.27zM133.63,355.01c-17.78,0 -32.2,-14.42 -32.2,-32.2 0,-17.78 14.42,-32.19 32.2,-32.19 17.78,0 32.19,14.41 32.19,32.19 0,17.78 -14.41,32.2 -32.19,32.2zM133.63,267.2c-17.78,0 -32.2,-14.42 -32.2,-32.2s14.42,-32.19 32.2,-32.19c17.78,0 32.19,14.41 32.19,32.19s-14.41,32.2 -32.19,32.2zM133.63,179.39c-17.78,0 -32.2,-14.41 -32.2,-32.19s14.42,-32.2 32.2,-32.2c17.78,0 32.19,14.42 32.19,32.2s-14.41,32.19 -32.19,32.19zM235,355.01c-17.78,0 -32.19,-14.42 -32.19,-32.2 0,-17.78 14.41,-32.19 32.19,-32.19 17.78,0 32.2,14.41 32.2,32.19 0,17.78 -14.42,32.2 -32.2,32.2zM235,267.2c-17.78,0 -32.19,-14.42 -32.19,-32.2s14.41,-32.19 32.19,-32.19c17.78,0 32.2,14.41 32.2,32.19s-14.42,32.2 -32.2,32.2zM336.56,355.01c-17.79,0 -32.2,-14.42 -32.2,-32.2 0,-17.78 14.41,-32.19 32.2,-32.19s32.19,14.41 32.19,32.19c0,17.78 -14.41,32.2 -32.19,32.2zM336.56,267.2c-17.79,0 -32.2,-14.42 -32.2,-32.2s14.41,-32.19 32.2,-32.19 32.19,14.41 32.19,32.19 -14.41,32.2 -32.19,32.2zM336.56,179.39c-17.79,0 -32.2,-14.41 -32.2,-32.19s14.41,-32.2 32.2,-32.2 32.19,14.42 32.19,32.2 -14.41,32.19 -32.19,32.19z"
+        android:fillColor="#000"/>
+  </group>
+</vector>

app/src/main/res/drawable-anydpi/ic_notification_backup.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="470"
+    android:viewportHeight="470"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.84249085"
+      android:scaleY="0.84249085"
+      android:translateX="37.014652"
+      android:translateY="37.014652">
+    <path
+        android:pathData="m240.66,0.07c-131.62,-3.12 -239.56,101.27 -240.66,232.93 -0.46,55.96 18.65,107.42 50.87,148l-8.42,14.72 -20.62,36.07c-9.73,17.02 2.56,38.2 22.16,38.2h189.07c130.72,0 238.37,-106.96 236.91,-237.67 -1.39,-126.66 -103.02,-229.26 -229.31,-232.25zM370.94,252.81c-10.08,76.77 -80.85,127.66 -153.78,118.12 -55.81,-7.32 -100.93,-47.27 -114.95,-101.79 -12.75,-49.59 3.32,-102.34 41.02,-136.34h-27.9c-22.81,0 -22.83,-34.92 0,-34.92h74.78c9.63,0 17.46,7.83 17.46,17.46v74.79c0,22.82 -34.92,22.82 -34.92,0v-36.47c-32.18,24.71 -46.87,66.99 -36.63,106.81 10.44,40.62 44.08,70.4 85.68,75.86 55.87,7.31 107.29,-32.19 114.62,-88.05 3.54,-27.08 -3.66,-53.91 -20.28,-75.53 -16.63,-21.65 -40.69,-35.53 -67.76,-39.08 -22.75,-2.93 -18.03,-37.59 4.53,-34.61 76.19,9.99 127.7,79.85 118.12,153.75z"
+        android:fillColor="#000"/>
+  </group>
+</vector>

app/src/main/res/drawable-anydpi/ic_notification_unlocked.xml

@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="470"
+    android:viewportHeight="470"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.84249085"
+      android:scaleY="0.84249085"
+      android:translateX="37.014652"
+      android:translateY="37.014652">
+    <group>
+      <clip-path
+          android:pathData="M0,0h470v470h-470z"/>
+      <path
+          android:pathData="m235,255.82c-15.86,0 -28.78,12.91 -28.78,28.78s12.91,28.78 28.78,28.78 28.78,-12.91 28.78,-28.78 -12.91,-28.78 -28.78,-28.78z"
+          android:fillColor="#000"/>
+      <path
+          android:pathData="m240.66,0.07c-131.62,-3.12 -239.56,101.27 -240.66,232.93 -0.46,55.96 18.65,107.42 50.87,148 -9.68,16.93 -19.36,33.86 -29.04,50.79 -9.73,17.02 2.56,38.2 22.16,38.2h189.08c130.72,0 238.37,-106.96 236.91,-237.67 -1.4,-126.66 -103.03,-229.26 -229.32,-232.25zM350.11,327.77c0,23.8 -19.36,43.17 -43.17,43.17h-143.89c-23.8,0 -43.17,-19.36 -43.17,-43.17v-86.33c0,-23.8 19.36,-43.17 43.17,-43.17h115.11v-40.57c0,-23.8 -19.36,-43.17 -43.17,-43.17s-43.17,19.36 -43.17,43.17c0,7.95 -6.44,14.39 -14.39,14.39s-14.39,-6.44 -14.39,-14.39c0,-39.67 32.28,-71.94 71.94,-71.94s71.94,32.28 71.94,71.94v40.57c23.8,0 43.17,19.36 43.17,43.17v86.33z"
+          android:fillColor="#000"/>
+    </group>
+  </group>
+</vector>

app/src/main/res/drawable-anydpi/ic_notification_websocket.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="470"
+    android:viewportHeight="470"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.84249085"
+      android:scaleY="0.84249085"
+      android:translateX="37.014652"
+      android:translateY="37.014652">
+    <path
+        android:pathData="m240.7,0.1c-131.7,-3.1 -239.6,101.2 -240.7,232.9 -0.5,56 18.6,107.4 50.9,148 -9.68,16.93 -19.34,33.87 -29,50.8 -9.7,17 2.6,38.2 22.2,38.2h189.1c130.7,0 238.4,-107 236.9,-237.7 -1.5,-126.6 -103.2,-229.2 -229.4,-232.2zM311.3,124.7 L350.4,163.4c3.7,3.5 5.6,8.4 5.5,13.4 -0.63,15.75 -19.8,22.89 -30.9,12.1l-8,-7.9v151.8c0,23.2 -36.6,23.07 -36.6,0v-151.8l-8,7.9c-17.92,16.25 -40.98,-8.31 -25.5,-25.5l39.1,-38.7c6.99,-6.89 18.31,-6.89 25.3,0zM171.3,119.6c10.1,0 18.3,8 18.3,17.7v151.7l8,-7.9c17.92,-16.25 40.98,8.31 25.5,25.5l-39.1,38.7c-7,6.9 -18.3,6.9 -25.3,0l-39.1,-38.7c-3.7,-3.5 -5.6,-8.4 -5.5,-13.4 0.63,-15.75 19.8,-22.89 30.9,-12.1l8,7.9v-151.7c0,-9.8 8.2,-17.7 18.3,-17.7z"
+        android:fillColor="#000"/>
+  </group>
+</vector>

app/src/main/res/drawable-night/delete_sync.xml

@@ -8,11 +8,11 @@
       android:fillColor="#373D52"/>
   <path
       android:pathData="M125.47,0.17C132.55,0.17 138.3,5.91 138.3,13L138.3,72.4C138.3,79.49 132.55,85.24 125.47,85.24L38.93,85.24C31.84,85.24 26.1,79.49 26.1,72.4L26.1,13C26.1,5.91 31.84,0.17 38.93,0.17L125.47,0.17ZM134.63,13C134.63,7.94 130.53,3.84 125.47,3.84L38.93,3.84C33.87,3.84 29.77,7.94 29.77,13L29.77,72.4C29.77,77.46 33.87,81.57 38.93,81.57L125.47,81.57C130.53,81.57 134.63,77.46 134.63,72.4L134.63,13Z"
-      android:fillColor="@color/core_ultramarine_light_50"
+      android:fillColor="#BEAFFF"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M96,58C96,54.69 98.69,52 102,52H125C128.31,52 131,54.69 131,58V66C131,69.31 128.31,72 125,72H102C98.69,72 96,69.31 96,66V58Z"
-      android:fillColor="#6A77DD"/>
+      android:fillColor="#8069E8"/>
   <path
       android:pathData="M40,36C40,32.69 42.69,30 46,30H62C65.31,30 68,32.69 68,36V41C68,44.31 65.31,47 62,47H46C42.69,47 40,44.31 40,41V36Z"
       android:fillColor="#D5D9FD"/>
@@ -24,11 +24,11 @@
       android:fillColor="#373D52"/>
   <path
       android:pathData="M1.17,35.47C1.17,28.93 6.46,23.63 13,23.63L33.33,23.63C39.87,23.63 45.17,28.93 45.17,35.47V80C45.17,86.54 39.87,91.84 33.33,91.84H13C6.46,91.84 1.17,86.54 1.17,80L1.17,35.47ZM13,27.3C8.49,27.3 4.84,30.96 4.84,35.47L4.84,80C4.84,84.51 8.49,88.17 13,88.17H33.33C37.84,88.17 41.5,84.51 41.5,80V35.47C41.5,30.96 37.84,27.3 33.33,27.3H13Z"
-      android:fillColor="#BDB4F7"
+      android:fillColor="#BEAFFF"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M19.13,70.07C19.13,67.31 21.37,65.07 24.13,65.07H33.93C36.69,65.07 38.93,67.31 38.93,70.07V74.73C38.93,77.49 36.69,79.73 33.93,79.73H24.13C21.37,79.73 19.13,77.49 19.13,74.73V70.07Z"
-      android:fillColor="#6A77DD"/>
+      android:fillColor="#8069E8"/>
   <path
       android:pathData="M6.67,56.73C6.67,53.9 8.96,51.6 11.8,51.6H21.33C24.17,51.6 26.47,53.9 26.47,56.73V56.73C26.47,59.57 24.17,61.87 21.33,61.87H11.8C8.96,61.87 6.67,59.57 6.67,56.73V56.73Z"
       android:fillColor="#D5D9FD"/>

app/src/main/res/drawable-night/ic_add_money_80.xml

@@ -33,7 +33,7 @@
       android:fillColor="#969dae"/>
   <path
       android:pathData="M52.8,23m-9.6,0a9.6,9.6 0,1 1,19.2 0a9.6,9.6 0,1 1,-19.2 0"
-      android:fillColor="#5F4BF1"/>
+      android:fillColor="#7152FF"/>
   <path
       android:pathData="M52.6,17.5h0a0.9,0.9 0,0 1,0.9 0.9v8.9a0.9,0.9 0,0 1,-0.9 0.8h0a0.9,0.9 0,0 1,-0.9 -0.8V18.4A0.9,0.9 0,0 1,52.6 17.5Z"
       android:fillColor="#fff"/>