From ff830ee50d1323af3661c42ff467ab878c258b01 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Wed, 5 Aug 2026 23:09:01 +0200 Subject: [PATCH] Improve notification icons This improves the sizing of the notification icons and uses a generic sync icon for the Bluetooth server running (so users don't get used to ignoring the Catima icon). Generated throudh Android Studio New -> Image Asset -> Notification Icons -> Path: .design/master_monochrome.svg -> Trim: Yes -> Padding: 0% --- .../protect/card_locker/NotificationInfo.kt | 1 - .../BluetoothPairingNotificationManager.kt | 2 +- .../wearos/BluetoothServerService.kt | 2 +- .../ic_notification_catima.xml | 73 ++++++++++++++++++ .../ic_notification_sync.xml | 30 +++++++ .../drawable-hdpi/ic_notification_catima.png | Bin 0 -> 790 bytes .../drawable-hdpi/ic_notification_sync.png | Bin 0 -> 499 bytes .../drawable-mdpi/ic_notification_catima.png | Bin 0 -> 509 bytes .../drawable-mdpi/ic_notification_sync.png | Bin 0 -> 346 bytes .../drawable-xhdpi/ic_notification_catima.png | Bin 0 -> 1123 bytes .../drawable-xhdpi/ic_notification_sync.png | Bin 0 -> 656 bytes .../ic_notification_catima.png | Bin 0 -> 1648 bytes .../drawable-xxhdpi/ic_notification_sync.png | Bin 0 -> 918 bytes 13 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/drawable-anydpi-v24/ic_notification_catima.xml create mode 100644 app/src/main/res/drawable-anydpi-v24/ic_notification_sync.xml create mode 100644 app/src/main/res/drawable-hdpi/ic_notification_catima.png create mode 100644 app/src/main/res/drawable-hdpi/ic_notification_sync.png create mode 100644 app/src/main/res/drawable-mdpi/ic_notification_catima.png create mode 100644 app/src/main/res/drawable-mdpi/ic_notification_sync.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_notification_catima.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_notification_sync.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_notification_catima.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_notification_sync.png diff --git a/app/src/main/java/protect/card_locker/NotificationInfo.kt b/app/src/main/java/protect/card_locker/NotificationInfo.kt index d104883ed..356e11fb7 100644 --- a/app/src/main/java/protect/card_locker/NotificationInfo.kt +++ b/app/src/main/java/protect/card_locker/NotificationInfo.kt @@ -4,7 +4,6 @@ object NotificationInfo { object WearBluetooth { const val NOTIFICATION_ID = 1001 const val CHANNEL_ID = "catima_wear_bt" - const val PAIRING_NOTIFICATION_ID = 1002 const val PAIRING_CHANNEL_ID = "catima_wear_bt_pairing" } } diff --git a/app/src/main/java/protect/card_locker/wearos/BluetoothPairingNotificationManager.kt b/app/src/main/java/protect/card_locker/wearos/BluetoothPairingNotificationManager.kt index 2919d11a5..a9eb93669 100644 --- a/app/src/main/java/protect/card_locker/wearos/BluetoothPairingNotificationManager.kt +++ b/app/src/main/java/protect/card_locker/wearos/BluetoothPairingNotificationManager.kt @@ -87,7 +87,7 @@ object BluetoothPairingNotificationManager { ) val notification = NotificationCompat.Builder(context, NotificationInfo.WearBluetooth.PAIRING_CHANNEL_ID) - .setSmallIcon(R.drawable.ic_launcher_monochrome) + .setSmallIcon(R.drawable.ic_notification_catima) .setContentTitle(context.getString(titleRes, deviceName)) .setContentText(context.getString(messageRes, deviceName)) .setStyle(NotificationCompat.BigTextStyle().bigText(context.getString(messageRes, deviceName))) diff --git a/app/src/main/java/protect/card_locker/wearos/BluetoothServerService.kt b/app/src/main/java/protect/card_locker/wearos/BluetoothServerService.kt index c582ffde8..17670195b 100644 --- a/app/src/main/java/protect/card_locker/wearos/BluetoothServerService.kt +++ b/app/src/main/java/protect/card_locker/wearos/BluetoothServerService.kt @@ -74,7 +74,7 @@ class BluetoothServerService : Service() { } val notification = NotificationCompat.Builder(this, CHANNEL_ID) .setContentTitle(getString(R.string.wear_bt_notification_title)) - .setSmallIcon(R.drawable.ic_launcher_monochrome) + .setSmallIcon(R.drawable.ic_notification_sync) .setPriority(NotificationCompat.PRIORITY_MIN) .setSilent(true) .build() diff --git a/app/src/main/res/drawable-anydpi-v24/ic_notification_catima.xml b/app/src/main/res/drawable-anydpi-v24/ic_notification_catima.xml new file mode 100644 index 000000000..c6accecce --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v24/ic_notification_catima.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable-anydpi-v24/ic_notification_sync.xml b/app/src/main/res/drawable-anydpi-v24/ic_notification_sync.xml new file mode 100644 index 000000000..a0dc4c218 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v24/ic_notification_sync.xml @@ -0,0 +1,30 @@ + + + + + + diff --git a/app/src/main/res/drawable-hdpi/ic_notification_catima.png b/app/src/main/res/drawable-hdpi/ic_notification_catima.png new file mode 100644 index 0000000000000000000000000000000000000000..30ffbfd093b82900206406ab38532de08167710f GIT binary patch literal 790 zcmV+x1L^#UP)zgy^Qlkw?!DGod)>MF>~p84W`gmAh%~@1 z_yBI^coxX5g{NQ-Jk9Znux8S@1=pnHPlnszn>f8dALo}1irlbbkKpQ{c*rGK2VZjl zJcZMO@mgM^EKuMb9Dpm}5_2Uy4qsS|y$|;U`RXocP-&CL~SCYWmp$2R91>f%_0lxQdm$A`X4T?3R=pW)w*p%7dc2u?Qqhm*k1wFYfHn|0WK>S;8l2nc(_^*33?h zWrE}uaVK*rUc%dOzhwL_N&~rf?fO+5`)9-*YHi}a|5sKp3;iHR;d;0rrIx3GV-+Lr zRIS$q;TiZfScn;c-^ATjy*4+@HOCArwis>^cfRNzOk*Kmmpf=;k)-@kn_%4V7a<)E UG9bjTEC2ui07*qoM6N<$f;=*QtN;K2 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_notification_sync.png b/app/src/main/res/drawable-hdpi/ic_notification_sync.png new file mode 100644 index 0000000000000000000000000000000000000000..7ebc25cc95ee7d7dd17c9d147e8d924b8ff11d82 GIT binary patch literal 499 zcmVS6om`6Q2&1rL0kmIg>NK?D>wQI;$B5v2wk`oeG7e$B2+{aL^ryyiXhhOnKo%| zP9`>!bU7a!O6Hz>a+#D&Dix2%;~9*IOhOyblBE{N0Jx_V$UBFA!|WAHJ&10c1@{yJ zIn&T9WiMNN0eK9M&}}5{aRwn1$^7mPU9ry~_JIte>@AEWccu+3uqQ&Y2YO;}ArN$; zLd`HE?9oVapd;v0U0<@_2?W%jP8eo>r`W?ta-ajK4*i7J=24GxPj1k>-j5bJk$vy?}Q4;Jx~@y$x<2jTyq5(tziz-;+iYN z9;m}LS0p}eN)7bPA<{cSRzp>_|39J}(BxWf(7dC9j>ENGwU#sF^`YH5H-dXlJgOD4gyJUWs)FYGh=f}IKBcv1*Y$LTp5)Wklz!zLE pMSR~(Y&*0FZ9;Xfc|0DEg+HYPtz^0(^$q|4002ovPDHLkV1n9X*O&kR literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_notification_catima.png b/app/src/main/res/drawable-mdpi/ic_notification_catima.png new file mode 100644 index 0000000000000000000000000000000000000000..c0bd976352b2d2af091f8e6f0b890f94e8ed41a4 GIT binary patch literal 509 zcmV zE9@Hsr4#6a5x8*bYw!+}zE6@Es)ixBh9#IaY@3?p${5?e`a$O~4Mo0hOf>2wH;VY) zG0|u;1I2zXQ?a&O8Tj>>auiUORRHIMa0y{=wi3=n-|SAOo^`+rbi*nfI`v1GfL{23 zGEElClOt(<^9zn2gI$D;SWWgO~F|HI7hdNT(S4=577-Q)j65(7G56Fx;7 zRX~;K2kHoFpk4HRc!NdJ>uo^T9F+=E1t??n02MkvKwWE9SB6o@Gj%n;B|6*&Je#^w zC@H|2x}shx`u!91dsgD?A`WBr+&0q&WFi}Yrpz(^ev;e-gp7yMsNZaKnt#zwg0Yq8 zYa9{%4N!W3IjDsaF*o%m(I0@QUr!JNh0p^1unzYo%<2aAU z;ZF3HwNl>*rFnnduZ3B@=*!vw%P{QE{2zS*N#lj>hiw9X00000NkvXXu0mjfZYSQs literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_notification_sync.png b/app/src/main/res/drawable-mdpi/ic_notification_sync.png new file mode 100644 index 0000000000000000000000000000000000000000..ef081c45ca07b2b73036ce2478f854792be0288f GIT binary patch literal 346 zcmV-g0j2(lP)l-0S8@2wBPa}N s8La3kxW5OtDqfs>y;~F$*kP844sI}DF)bmt}jmZmhr&BLcJE-~AUvYSnE|hYM`iUBE zJE{Z>+SrQ0;t!dVrI11OQja9^JE>D~c#^X=w<56cr|KlndfR&H4`tWfpkAf=ti$sk z^&Rz?ul0-aO^DB40a)~=FFus;O{R8^oPKovq@JUiO%3@z1lDQaJ;5Sv)PCxcDqL%> zQ!m=Fm4!*Iw$d20#Ex-Pn6Swd_=b89?siuzeS{)c>=;Ld37b{&6zi`QJoo!*9Fwd+ z69#WpiH}-;tw6l)v|4{AXf#k6P>TlWUj_GtTWNhM7}pH9m->)eWc?acvjN&Ss2I%} z8yleSV;f9{sV8l$fVhFF)}IN=G(g)F<^Pe|MO{#~wnWZ$?~@JO0JWRC>}|5jHzjg( z13lKC3CcHc-22uWyWGEpecJAQ7rig4$Iqv|eYUoHpKjo)^=E=I4G6Svwl;zG9weR- zXq!ZJChW4y-DvFss@Xs-K-|C)>(2y<2Ke_GYH5a+Q}a~*Ya!Y5Kl~P%f19Y)D6J9H z0l(@ZZeUrcUly1Kyvm~TWq=y_;!gCwv&NUi$La>!s20S}7q5hKMxe9-xp#j_eed;~ z@&|r3HLfaOzp~GQyCNESEIor_{XITbH!vOPt$lm(tRAGNkaWLI*#)`%ZBu#D=v&ly zsyzgG-yCX{ik(3n3o)MGsh3rZZr~qv{FgfJ4e=wO^a@N=pJh5+qvj^^^a;Z~UN|2P zY>q(lJJi3$@Z=N|wMLCeM7vgcZvUlj55O7}&R0<>-;NJ(KuB^=| zfI4k}dK~e0WrfWtfck7eZnK&`8$SY_TU6j!J`>AxL*R-!K44=bU>bm1{-?n$CUXC- zg`Pt3Wtz-+d6Rb%iCt?6h#RN}2J9F|1@UW@v1Vi&k{c$yp$f>tB8!+T^FLERP@lj( z2fte-$$sb@HEhS08@SDz-VUUYc_}O832M2maj(F=04`vCcLnpGrZ!UjexP|7qQ0W` z!umIminEw@eg9Z&E?f@$fo0h8b21Eb=002ovPDHLkV1huQA>{x7 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_notification_sync.png b/app/src/main/res/drawable-xhdpi/ic_notification_sync.png new file mode 100644 index 0000000000000000000000000000000000000000..140cb2a09ff21cf942763a25e231f1eb7c36959a GIT binary patch literal 656 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 soTc@1K;8Mam@&o}V~jDz7-Kr_AK_IUbFr