add vector notification icon compatibility

thesiamak · Jun 8, 2019 · 39d266e · 39d266e
1 parent 6634ced
commit 39d266e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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) {