From 24324f9664441f0533acfc35ca2467c539422fb8 Mon Sep 17 00:00:00 2001
From: Aline Bonnet <aline.bonnet@savoirfairelinux.com>
Date: Tue, 1 Nov 2016 12:36:36 -0400
Subject: [PATCH] ui: change the notification symbol

This commit replaces the blue ring logo with the white ring logo in the
notification bar.

Change-Id: I1cb52e3e03cdd6c041e8b26a99660b1101affea8
Tuleap: #1165
---
 .../src/main/java/cx/ring/model/Conference.java   |  2 +-
 .../main/java/cx/ring/service/LocalService.java   |  2 +-
 .../src/main/res/drawable/ic_ring_logo_white.xml  | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 ring-android/app/src/main/res/drawable/ic_ring_logo_white.xml

diff --git a/ring-android/app/src/main/java/cx/ring/model/Conference.java b/ring-android/app/src/main/java/cx/ring/model/Conference.java
index 1dd7271a5..549b178e8 100644
--- a/ring-android/app/src/main/java/cx/ring/model/Conference.java
+++ b/ring-android/app/src/main/java/cx/ring/model/Conference.java
@@ -343,7 +343,7 @@ public class Conference {
             return;
         }
 
-        noti.setOngoing(true).setCategory(NotificationCompat.CATEGORY_CALL).setSmallIcon(R.drawable.ic_launcher);
+        noti.setOngoing(true).setCategory(NotificationCompat.CATEGORY_CALL).setSmallIcon(R.drawable.ic_ring_logo_white);
 
         if (contact.getPhoto() != null) {
             Resources res = ctx.getResources();
diff --git a/ring-android/app/src/main/java/cx/ring/service/LocalService.java b/ring-android/app/src/main/java/cx/ring/service/LocalService.java
index 08315a64a..31077f42e 100644
--- a/ring-android/app/src/main/java/cx/ring/service/LocalService.java
+++ b/ring-android/app/src/main/java/cx/ring/service/LocalService.java
@@ -1191,7 +1191,7 @@ public class LocalService extends Service implements SharedPreferences.OnSharedP
                 c.notificationBuilder.setCategory(NotificationCompat.CATEGORY_MESSAGE)
                         .setPriority(NotificationCompat.PRIORITY_HIGH)
                         .setDefaults(NotificationCompat.DEFAULT_ALL)
-                        .setSmallIcon(R.drawable.ic_launcher)
+                        .setSmallIcon(R.drawable.ic_ring_logo_white)
                         .setContentTitle(contact.getDisplayName());
             }
             NotificationCompat.Builder noti = c.notificationBuilder;
diff --git a/ring-android/app/src/main/res/drawable/ic_ring_logo_white.xml b/ring-android/app/src/main/res/drawable/ic_ring_logo_white.xml
new file mode 100644
index 000000000..fd611f7ef
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable/ic_ring_logo_white.xml
@@ -0,0 +1,15 @@
+<vector android:height="24dp" android:viewportHeight="216.0"
+    android:viewportWidth="216.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M40.46,66.68c0,0 21.22,-3.9 36.63,-4.61c0,0 -11.93,-24.26 -11.94,-45.38l-28.44,18.57C36.71,35.26 32.22,42.78 40.46,66.68z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M71.58,13.33c0,0 -2.68,16.45 11.8,47.66c0,0 12.53,-17.08 20.33,-25.38C103.71,35.61 85.45,15.29 71.58,13.33z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M90.8,61.33c0,0 31.49,-44.41 53.48,-48c0,0 2.43,17.8 -12.01,48.4C132.27,61.73 115.64,60.99 90.8,61.33z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M150.73,16.7c0,0 0.21,35.55 -39.1,95.03c0,0 18.05,25.91 22.51,30.3c0,0 54.99,-77.38 45.11,-106.64L150.73,16.7z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M179.31,73.9c0,0 -9.62,22.13 -16.02,33.13c0,0 30.37,4.84 44.51,14.78V88.2C207.79,88.2 205.75,80.47 179.31,73.9z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M165.94,113.78c0,0 30.19,5.33 41.15,15.26c0,0 -7.01,8.67 -27.79,13.03c0,0 -8.07,-19.63 -13.37,-27.85"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M159.25,114.44c0,0 -14.45,23.91 -20.98,32.44c0,0 23.99,28 41.32,32.83C179.59,179.71 187.05,163.83 159.25,114.44z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M62.53,111.92c0,0 33.28,-3.75 39.97,-2.84c0,0 29.11,50.77 71.39,75.15l-28.62,18.44C145.28,202.66 119.37,205.96 62.53,111.92z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M81.17,151.92c0,0 10.75,14.95 22.54,28.44c0,0 -18.3,20.68 -33.08,22.3l-28.7,-18.47C41.93,184.2 57.53,179.04 81.17,151.92z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M71.34,153.48c0,0 -19.9,21.86 -34.7,26.09c0,0 -4.61,-5.91 3.83,-30.28C40.46,149.29 51.61,152.2 71.34,153.48z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M55.9,112.86c0,0 14.9,24.02 22.51,34.81c0,0 -53.75,-1.64 -69.65,-18.63C8.75,129.03 21.54,117.67 55.9,112.86z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M8.21,87.71v34.11c0,0 24.74,-19.02 101.77,-18.98c0,0 18.74,-30.96 19.48,-35.04C129.46,67.81 30.26,62.22 8.21,87.71z"/>
+</vector>
-- 
GitLab