From 39d266e62b265c531f112e2d7de8731226406506 Mon Sep 17 00:00:00 2001 From: Siamak Date: Sat, 8 Jun 2019 14:02:19 +0430 Subject: [PATCH] add vector notification icon compatibility --- app/build.gradle | 1 + app/src/main/res/layout/disconnected_banner.xml | 2 +- .../main/java/ir/drax/netwatch/NetworkChangeReceiver.java | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fdab639..b570de6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,6 +9,7 @@ android { versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + vectorDrawables.useSupportLibrary = true } buildTypes { release { diff --git a/app/src/main/res/layout/disconnected_banner.xml b/app/src/main/res/layout/disconnected_banner.xml index c95a2ee..fb3af72 100644 --- a/app/src/main/res/layout/disconnected_banner.xml +++ b/app/src/main/res/layout/disconnected_banner.xml @@ -16,7 +16,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" android:id="@+id/icon" - android:src="@drawable/ic_signal_wifi_off" + app:srcCompat="@drawable/ic_signal_wifi_off" android:layout_centerInParent="true" android:layout_width="120dp" android:layout_height="120dp" /> diff --git a/netwatch/src/main/java/ir/drax/netwatch/NetworkChangeReceiver.java b/netwatch/src/main/java/ir/drax/netwatch/NetworkChangeReceiver.java index f105fc0..e9b7e20 100644 --- a/netwatch/src/main/java/ir/drax/netwatch/NetworkChangeReceiver.java +++ b/netwatch/src/main/java/ir/drax/netwatch/NetworkChangeReceiver.java @@ -95,12 +95,15 @@ private static void detectAndAct(Context context, int status){ Bitmap bitmap = BitmapFactory.decodeResource(context.getResources(), getNotificationIcon()); mBuilder = new NotificationCompat.Builder(context) - .setSmallIcon(getNotificationIcon()) .setLargeIcon(bitmap) .setColor(Color.parseColor("#ffffff")) .setContentTitle(message == null ? context.getString(R.string.netwatch_lost_connection) : message) .setAutoCancel(true) .setOngoing(!cancelable); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + mBuilder.setSmallIcon(getNotificationIcon()); + } } NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {