From 732333ab998d1b11e1ef980506fc003525011c9a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 29 Mar 2018 19:09:56 -0400 Subject: [PATCH] Update color for notification actions, for android wear --- .../common/util/NotificationManagerImpl.kt | 4 +-- ...black_24dp.xml => ic_check_white_24dp.xml} | 2 +- .../main/res/drawable/ic_done_black_24dp.xml | 27 ------------------- ...black_24dp.xml => ic_reply_white_24dp.xml} | 2 +- .../src/main/res/layout/menu_list_item.xml | 2 +- .../main/res/layout/qksms_plus_activity.xml | 2 +- .../src/main/res/layout/theme_list_item.xml | 2 +- presentation/src/main/res/menu/qkreply.xml | 2 +- 8 files changed, 8 insertions(+), 35 deletions(-) rename presentation/src/main/res/drawable/{ic_check_black_24dp.xml => ic_check_white_24dp.xml} (96%) delete mode 100644 presentation/src/main/res/drawable/ic_done_black_24dp.xml rename presentation/src/main/res/drawable/{ic_reply_black_24dp.xml => ic_reply_white_24dp.xml} (96%) diff --git a/presentation/src/main/java/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/common/util/NotificationManagerImpl.kt index 94f151e3..4320a8c7 100644 --- a/presentation/src/main/java/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/common/util/NotificationManagerImpl.kt @@ -116,7 +116,7 @@ class NotificationManagerImpl @Inject constructor( val readIntent = Intent(context, MarkReadReceiver::class.java).putExtra("threadId", threadId) val readPI = PendingIntent.getBroadcast(context, threadId.toInt() + 30000, readIntent, PendingIntent.FLAG_UPDATE_CURRENT) - val readAction = NotificationCompat.Action(R.drawable.ic_done_black_24dp, context.getString(R.string.notification_read), readPI) + val readAction = NotificationCompat.Action(R.drawable.ic_check_white_24dp, context.getString(R.string.notification_read), readPI) val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId)) .setColor(colors.themeForConversation(threadId).blockingFirst()) @@ -191,7 +191,7 @@ class NotificationManagerImpl @Inject constructor( .build() return NotificationCompat.Action.Builder( - R.drawable.ic_reply_black_24dp, + R.drawable.ic_reply_white_24dp, context.getString(R.string.notification_reply), replyPI) .addRemoteInput(remoteInput) .build() diff --git a/presentation/src/main/res/drawable/ic_check_black_24dp.xml b/presentation/src/main/res/drawable/ic_check_white_24dp.xml similarity index 96% rename from presentation/src/main/res/drawable/ic_check_black_24dp.xml rename to presentation/src/main/res/drawable/ic_check_white_24dp.xml index 8d82bf82..a7e738ca 100644 --- a/presentation/src/main/res/drawable/ic_check_black_24dp.xml +++ b/presentation/src/main/res/drawable/ic_check_white_24dp.xml @@ -22,6 +22,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/presentation/src/main/res/drawable/ic_done_black_24dp.xml b/presentation/src/main/res/drawable/ic_done_black_24dp.xml deleted file mode 100644 index 3eac0a14..00000000 --- a/presentation/src/main/res/drawable/ic_done_black_24dp.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - diff --git a/presentation/src/main/res/drawable/ic_reply_black_24dp.xml b/presentation/src/main/res/drawable/ic_reply_white_24dp.xml similarity index 96% rename from presentation/src/main/res/drawable/ic_reply_black_24dp.xml rename to presentation/src/main/res/drawable/ic_reply_white_24dp.xml index fe9d30e3..c5527cfc 100644 --- a/presentation/src/main/res/drawable/ic_reply_black_24dp.xml +++ b/presentation/src/main/res/drawable/ic_reply_white_24dp.xml @@ -22,6 +22,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/presentation/src/main/res/layout/menu_list_item.xml b/presentation/src/main/res/layout/menu_list_item.xml index 23f68869..4111da45 100644 --- a/presentation/src/main/res/layout/menu_list_item.xml +++ b/presentation/src/main/res/layout/menu_list_item.xml @@ -40,6 +40,6 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_marginRight="24dp" - android:src="@drawable/ic_check_black_24dp" /> + android:src="@drawable/ic_check_white_24dp" /> \ No newline at end of file diff --git a/presentation/src/main/res/layout/qksms_plus_activity.xml b/presentation/src/main/res/layout/qksms_plus_activity.xml index 7ea41d73..4abfdb42 100644 --- a/presentation/src/main/res/layout/qksms_plus_activity.xml +++ b/presentation/src/main/res/layout/qksms_plus_activity.xml @@ -231,7 +231,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:alpha="0.25" - app:icon="@drawable/ic_reply_black_24dp" + app:icon="@drawable/ic_reply_white_24dp" app:summary="@string/qksms_plus_respond_summary" app:title="@string/qksms_plus_respond_title" /> diff --git a/presentation/src/main/res/layout/theme_list_item.xml b/presentation/src/main/res/layout/theme_list_item.xml index 4a55f7e0..34614170 100644 --- a/presentation/src/main/res/layout/theme_list_item.xml +++ b/presentation/src/main/res/layout/theme_list_item.xml @@ -35,7 +35,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_gravity="center" - android:src="@drawable/ic_check_black_24dp" + android:src="@drawable/ic_check_white_24dp" tools:tint="@color/textPrimaryDark" /> \ No newline at end of file diff --git a/presentation/src/main/res/menu/qkreply.xml b/presentation/src/main/res/menu/qkreply.xml index 01ddf187..4dd40b8b 100644 --- a/presentation/src/main/res/menu/qkreply.xml +++ b/presentation/src/main/res/menu/qkreply.xml @@ -21,7 +21,7 @@