diff --git a/library/build.gradle b/library/build.gradle index d1afc6b..740e195 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "23.0.2" + compileSdkVersion 27 + buildToolsVersion "27.0.3" lintOptions { abortOnError false } defaultConfig { minSdkVersion 14 - targetSdkVersion 23 + targetSdkVersion 27 versionCode 1 versionName "1.0.0" } @@ -22,12 +22,12 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.android.support:design:23.1.1' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' - provided 'com.android.support:cardview-v7:23.1.1' + compileOnly 'com.android.support:cardview-v7:28.0.0' // Used for the preference classes - provided 'com.github.afollestad.material-dialogs:core:0.8.5.4@aar' - provided 'com.github.afollestad.material-dialogs:commons:0.8.5.4@aar' + implementation 'com.github.afollestad.material-dialogs:core:0.8.5.4@aar' + implementation 'com.github.afollestad.material-dialogs:commons:0.8.5.4@aar' } \ No newline at end of file diff --git a/library/src/main/java/com/afollestad/appthemeengine/ATE.java b/library/src/main/java/com/afollestad/appthemeengine/ATE.java index 1e883d8..bd6a631 100644 --- a/library/src/main/java/com/afollestad/appthemeengine/ATE.java +++ b/library/src/main/java/com/afollestad/appthemeengine/ATE.java @@ -6,8 +6,10 @@ import android.app.ActivityManager; import android.content.Context; import android.graphics.Bitmap; +import android.graphics.Canvas; import android.graphics.Color; import android.graphics.drawable.BitmapDrawable; +import android.graphics.Canvas; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Build; @@ -246,7 +248,7 @@ private static void applyTaskDescription(@NonNull Activity activity, @Nullable S color = ATEUtil.stripAlpha(color); // Default is app's launcher icon if (icon == null) - icon = ((BitmapDrawable) activity.getApplicationInfo().loadIcon(activity.getPackageManager())).getBitmap(); + icon = (getBitmapFromDrawable(activity.getApplicationInfo().loadIcon(activity.getPackageManager()))); // Sets color of entry in the system recents page ActivityManager.TaskDescription td = new ActivityManager.TaskDescription( @@ -288,6 +290,16 @@ public static void themeOverflow(@NonNull Activity activity, @Nullable String ke ATEUtil.setOverflowButtonColor(activity, toolbar, tintColor); } + @NonNull + private static Bitmap getBitmapFromDrawable(@NonNull Drawable drawable) { + Bitmap bmp = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), + Bitmap.Config.ARGB_8888); + Canvas canvas = new Canvas(bmp); + drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); + drawable.draw(canvas); + return bmp; + } + private ATE() { } } \ No newline at end of file diff --git a/library/src/main/java/com/afollestad/appthemeengine/ATEBase.java b/library/src/main/java/com/afollestad/appthemeengine/ATEBase.java index 60c0f60..a9ad45e 100644 --- a/library/src/main/java/com/afollestad/appthemeengine/ATEBase.java +++ b/library/src/main/java/com/afollestad/appthemeengine/ATEBase.java @@ -1,5 +1,6 @@ package com.afollestad.appthemeengine; +import android.graphics.Canvas; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.widget.Toolbar;