From 3018206e2f71bfe47eeb63fddb1926b75a54fb5a Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Tue, 13 Aug 2019 16:54:36 +0200 Subject: [PATCH] New icons for notifications --- .../ClipboardEntryNotificationService.kt | 6 +- .../KeyboardEntryNotificationService.kt | 2 +- .../drawable/ic_clipboard_key_white_24dp.xml | 12 ++++ .../drawable/ic_keyboard_key_white_24dp.xml | 17 +++++ .../res/drawable/ic_vpn_key_white_24dp.xml | 5 -- app/src/main/res/xml/keyboard_password.xml | 2 +- .../main/res/xml/keyboard_password_entry.xml | 2 +- art/ic_clipboard_notification.svg | 60 +++++++++++++++++ art/ic_magikeyboard_notification.svg | 65 +++++++++++++++++++ 9 files changed, 160 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/drawable/ic_clipboard_key_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_keyboard_key_white_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_vpn_key_white_24dp.xml create mode 100644 art/ic_clipboard_notification.svg create mode 100644 art/ic_magikeyboard_notification.svg diff --git a/app/src/main/java/com/kunzisoft/keepass/notifications/ClipboardEntryNotificationService.kt b/app/src/main/java/com/kunzisoft/keepass/notifications/ClipboardEntryNotificationService.kt index 4fd652678..46fa8531d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/notifications/ClipboardEntryNotificationService.kt +++ b/app/src/main/java/com/kunzisoft/keepass/notifications/ClipboardEntryNotificationService.kt @@ -114,7 +114,7 @@ class ClipboardEntryNotificationService : NotificationService() { stopTask(cleanCopyNotificationTimerTask) val builder = buildNewNotification() - .setSmallIcon(R.drawable.ic_key_white_24dp) + .setSmallIcon(R.drawable.ic_clipboard_key_white_24dp) if (title != null) builder.setContentTitle(title) @@ -129,7 +129,7 @@ class ClipboardEntryNotificationService : NotificationService() { fieldsWithoutFirstField.remove(field) // Add extra actions for (fieldToAdd in fieldsWithoutFirstField) { - builder.addAction(R.drawable.ic_key_white_24dp, fieldToAdd.label, + builder.addAction(R.drawable.ic_clipboard_key_white_24dp, fieldToAdd.label, getCopyPendingIntent(fieldToAdd, fieldsToAdd)) } } @@ -161,7 +161,7 @@ class ClipboardEntryNotificationService : NotificationService() { clipboardHelper?.copyToClipboard(fieldToCopy.label, fieldToCopy.value) val builder = buildNewNotification() - .setSmallIcon(R.drawable.ic_key_white_24dp) + .setSmallIcon(R.drawable.ic_clipboard_key_white_24dp) .setContentTitle(fieldToCopy.label) // New action with next field if click diff --git a/app/src/main/java/com/kunzisoft/keepass/notifications/KeyboardEntryNotificationService.kt b/app/src/main/java/com/kunzisoft/keepass/notifications/KeyboardEntryNotificationService.kt index 9024f0d86..f7a795f7d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/notifications/KeyboardEntryNotificationService.kt +++ b/app/src/main/java/com/kunzisoft/keepass/notifications/KeyboardEntryNotificationService.kt @@ -84,7 +84,7 @@ class KeyboardEntryNotificationService : NotificationService() { pendingDeleteIntent = PendingIntent.getService(this, 0, deleteIntent, PendingIntent.FLAG_UPDATE_CURRENT) val builder = buildNewNotification() - .setSmallIcon(R.drawable.ic_vpn_key_white_24dp) + .setSmallIcon(R.drawable.ic_keyboard_key_white_24dp) .setContentTitle(getString(R.string.keyboard_notification_entry_content_title, entryTitle)) .setContentText(getString(R.string.keyboard_notification_entry_content_text, entryUsername)) .setAutoCancel(false) diff --git a/app/src/main/res/drawable/ic_clipboard_key_white_24dp.xml b/app/src/main/res/drawable/ic_clipboard_key_white_24dp.xml new file mode 100644 index 000000000..778c118e7 --- /dev/null +++ b/app/src/main/res/drawable/ic_clipboard_key_white_24dp.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_keyboard_key_white_24dp.xml b/app/src/main/res/drawable/ic_keyboard_key_white_24dp.xml new file mode 100644 index 000000000..f9d077771 --- /dev/null +++ b/app/src/main/res/drawable/ic_keyboard_key_white_24dp.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_vpn_key_white_24dp.xml b/app/src/main/res/drawable/ic_vpn_key_white_24dp.xml deleted file mode 100644 index b1e2f9b8c..000000000 --- a/app/src/main/res/drawable/ic_vpn_key_white_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/xml/keyboard_password.xml b/app/src/main/res/xml/keyboard_password.xml index 42ffccfbb..281952a7c 100644 --- a/app/src/main/res/xml/keyboard_password.xml +++ b/app/src/main/res/xml/keyboard_password.xml @@ -39,7 +39,7 @@ diff --git a/art/ic_clipboard_notification.svg b/art/ic_clipboard_notification.svg new file mode 100644 index 000000000..4bae5aaa5 --- /dev/null +++ b/art/ic_clipboard_notification.svg @@ -0,0 +1,60 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/art/ic_magikeyboard_notification.svg b/art/ic_magikeyboard_notification.svg new file mode 100644 index 000000000..ca64bcef9 --- /dev/null +++ b/art/ic_magikeyboard_notification.svg @@ -0,0 +1,65 @@ + + + +image/svg+xml \ No newline at end of file