diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml new file mode 100644 index 00000000..1bccc7f3 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml @@ -0,0 +1,14 @@ + + + + + diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index fe66716f..00000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index dea5f299..00000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..7eace3db --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..7eace3db --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..9d4f7486 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/lib_ui/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from lib_ui/src/main/res/mipmap-hdpi/ic_launcher_foreground.png rename to app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 00000000..2e94c264 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..32ce358a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/lib_ui/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from lib_ui/src/main/res/mipmap-mdpi/ic_launcher_foreground.png rename to app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 00000000..f42d6f41 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/lib_ui/src/main/res/mipmap-mdpi/ic_shortcut_dfu.png b/app/src/main/res/mipmap-mdpi/ic_shortcut_dfu.png similarity index 100% rename from lib_ui/src/main/res/mipmap-mdpi/ic_shortcut_dfu.png rename to app/src/main/res/mipmap-mdpi/ic_shortcut_dfu.png diff --git a/lib_ui/src/main/res/mipmap-mdpi/ic_shortcut_uart.png b/app/src/main/res/mipmap-mdpi/ic_shortcut_uart.png similarity index 100% rename from lib_ui/src/main/res/mipmap-mdpi/ic_shortcut_uart.png rename to app/src/main/res/mipmap-mdpi/ic_shortcut_uart.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..c4f8ed71 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/lib_ui/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from lib_ui/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..3b2cb8c0 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/lib_ui/src/main/res/mipmap-xhdpi/ic_shortcut_dfu.png b/app/src/main/res/mipmap-xhdpi/ic_shortcut_dfu.png similarity index 100% rename from lib_ui/src/main/res/mipmap-xhdpi/ic_shortcut_dfu.png rename to app/src/main/res/mipmap-xhdpi/ic_shortcut_dfu.png diff --git a/lib_ui/src/main/res/mipmap-xhdpi/ic_shortcut_uart.png b/app/src/main/res/mipmap-xhdpi/ic_shortcut_uart.png similarity index 100% rename from lib_ui/src/main/res/mipmap-xhdpi/ic_shortcut_uart.png rename to app/src/main/res/mipmap-xhdpi/ic_shortcut_uart.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..da3ef59b Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/lib_ui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from lib_ui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..b8f5c932 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/lib_ui/src/main/res/mipmap-xxhdpi/ic_shortcut_dfu.png b/app/src/main/res/mipmap-xxhdpi/ic_shortcut_dfu.png similarity index 100% rename from lib_ui/src/main/res/mipmap-xxhdpi/ic_shortcut_dfu.png rename to app/src/main/res/mipmap-xxhdpi/ic_shortcut_dfu.png diff --git a/lib_ui/src/main/res/mipmap-xxhdpi/ic_shortcut_uart.png b/app/src/main/res/mipmap-xxhdpi/ic_shortcut_uart.png similarity index 100% rename from lib_ui/src/main/res/mipmap-xxhdpi/ic_shortcut_uart.png rename to app/src/main/res/mipmap-xxhdpi/ic_shortcut_uart.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..47a4b5cd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/lib_ui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from lib_ui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..826a412b Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/lib_ui/src/main/res/mipmap-xxxhdpi/ic_shortcut_dfu.png b/app/src/main/res/mipmap-xxxhdpi/ic_shortcut_dfu.png similarity index 100% rename from lib_ui/src/main/res/mipmap-xxxhdpi/ic_shortcut_dfu.png rename to app/src/main/res/mipmap-xxxhdpi/ic_shortcut_dfu.png diff --git a/lib_ui/src/main/res/mipmap-xxxhdpi/ic_shortcut_uart.png b/app/src/main/res/mipmap-xxxhdpi/ic_shortcut_uart.png similarity index 100% rename from lib_ui/src/main/res/mipmap-xxxhdpi/ic_shortcut_uart.png rename to app/src/main/res/mipmap-xxxhdpi/ic_shortcut_uart.png diff --git a/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt b/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt index 41d81211..61fac060 100644 --- a/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt +++ b/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt @@ -111,7 +111,7 @@ abstract class NotificationService : LifecycleService() { val pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE) return NotificationCompat.Builder(this, CHANNEL_ID) - .setSmallIcon(R.drawable.ic_launcher_foreground) + .setSmallIcon(R.drawable.ic_toolbox) .setContentTitle(getString(R.string.app_name)) .setContentText(getString(messageResId, "Device")) .setColor(ContextCompat.getColor(this, R.color.md_theme_primary)) diff --git a/lib_ui/src/main/res/drawable-anydpi/ic_toolbox.xml b/lib_ui/src/main/res/drawable-anydpi/ic_toolbox.xml new file mode 100644 index 00000000..a10de5fe --- /dev/null +++ b/lib_ui/src/main/res/drawable-anydpi/ic_toolbox.xml @@ -0,0 +1,14 @@ + + + + + diff --git a/lib_ui/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/lib_ui/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 6fc213de..00000000 Binary files a/lib_ui/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/lib_ui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/lib_ui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 324a2874..e69de29b 100644 --- a/lib_ui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/lib_ui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,37 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/lib_ui/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/lib_ui/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index e268605d..00000000 --- a/lib_ui/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/lib_ui/src/main/res/mipmap-hdpi/ic_launcher.png b/lib_ui/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index a6c183f8..00000000 Binary files a/lib_ui/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/lib_ui/src/main/res/mipmap-hdpi/ic_launcher_round.png b/lib_ui/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 19f21973..00000000 Binary files a/lib_ui/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/lib_ui/src/main/res/mipmap-mdpi/ic_launcher.png b/lib_ui/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 245f8fda..00000000 Binary files a/lib_ui/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/lib_ui/src/main/res/mipmap-mdpi/ic_launcher_round.png b/lib_ui/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 3bda01c2..00000000 Binary files a/lib_ui/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/lib_ui/src/main/res/mipmap-xhdpi/ic_launcher.png b/lib_ui/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index d7b43ec1..00000000 Binary files a/lib_ui/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/lib_ui/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/lib_ui/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index bb452688..00000000 Binary files a/lib_ui/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/lib_ui/src/main/res/mipmap-xxhdpi/ic_launcher.png b/lib_ui/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 3fc95be3..00000000 Binary files a/lib_ui/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/lib_ui/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/lib_ui/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index fa4849f9..00000000 Binary files a/lib_ui/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/lib_ui/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/lib_ui/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 570c6d71..00000000 Binary files a/lib_ui/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/lib_ui/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/lib_ui/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 93fc534d..00000000 Binary files a/lib_ui/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ