Fix #71 : Set bounds to drawable icon (6fa8b444) · Commits · e / os / BlissLauncher

app/src/main/java/foundation/e/blisslauncher/core/IconsHandler.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -198,7 +198,6 @@ public class IconsHandler {
	} else {		} else {
	systemIcon = graphicsUtil.convertToRoundedCorner(ctx,		systemIcon = graphicsUtil.convertToRoundedCorner(ctx,
	graphicsUtil.addBackground(systemIcon, false));		graphicsUtil.addBackground(systemIcon, false));

	}		}
	}		}

app/src/main/java/foundation/e/blisslauncher/core/utils/GraphicsUtil.java

+11 −18

Original line number	Original line	Diff line number	Diff line
	@@ -100,23 +100,18 @@ public class GraphicsUtil {
	* Scales icons to match the icon pack		* Scales icons to match the icon pack
	*/		*/
	public Drawable scaleImage(Context context, Drawable image, float scaleFactor) {		public Drawable scaleImage(Context context, Drawable image, float scaleFactor) {
	Log.i(TAG, "scaleImage: " + image.getIntrinsicWidth() + "*" + image.getIntrinsicHeight());
	if ((image == null) \|\| !(image instanceof BitmapDrawable)) {		if ((image == null) \|\| !(image instanceof BitmapDrawable)) {
	return image;		return image;
	}		}
	Bitmap b = ((BitmapDrawable) image).getBitmap();		Bitmap b = ((BitmapDrawable) image).getBitmap();
	int sizeX = Math.round(image.getIntrinsicWidth() * scaleFactor);		int sizeX = Math.round(image.getIntrinsicWidth() * scaleFactor);
	Log.i(TAG, "sizeX: " + sizeX);
	int sizeY = Math.round(image.getIntrinsicHeight() * scaleFactor);		int sizeY = Math.round(image.getIntrinsicHeight() * scaleFactor);
	Log.i(TAG, "sizeY: " + sizeY);
	Bitmap bitmapResized = Bitmap.createScaledBitmap(b, sizeX, sizeY, false);		Bitmap bitmapResized = Bitmap.createScaledBitmap(b, sizeX, sizeY, false);
	image = new BitmapDrawable(context.getResources(), bitmapResized);		image = new BitmapDrawable(context.getResources(), bitmapResized);
	Log.i(TAG, "scaleImage2: " + image.getIntrinsicWidth() + "*" + image.getIntrinsicHeight());
	return image;		return image;
	}		}

	public Bitmap addBackground(Bitmap bitmap, boolean isFolder) {		public Bitmap addBackground(Bitmap bitmap, boolean isFolder) {

	if (!hasTransparency(bitmap)) {		if (!hasTransparency(bitmap)) {
	bitmap = Bitmap.createScaledBitmap(bitmap, appIconWidth,		bitmap = Bitmap.createScaledBitmap(bitmap, appIconWidth,
	(appIconWidth * bitmap.getHeight() / bitmap.getWidth()),		(appIconWidth * bitmap.getHeight() / bitmap.getWidth()),
	@@ -135,8 +130,7 @@ public class GraphicsUtil {
	Bitmap mergedBitmap = Bitmap.createBitmap(width, height, Bitmap		Bitmap mergedBitmap = Bitmap.createBitmap(width, height, Bitmap
	.Config.ARGB_8888);		.Config.ARGB_8888);
	Canvas canvas = new Canvas(mergedBitmap);		Canvas canvas = new Canvas(mergedBitmap);
	canvas.drawColor(isFolder ? Color.WHITE		canvas.drawColor(isFolder ? Color.WHITE : getDominantColor(bitmap));
	: getDominantColor(bitmap));

	Paint paint = new Paint(		Paint paint = new Paint(
	Paint.ANTI_ALIAS_FLAG \| Paint.DITHER_FLAG \| Paint.FILTER_BITMAP_FLAG);		Paint.ANTI_ALIAS_FLAG \| Paint.DITHER_FLAG \| Paint.FILTER_BITMAP_FLAG);
	@@ -146,18 +140,16 @@ public class GraphicsUtil {
	}		}

	public Bitmap addBackground(Drawable appIcon, boolean isFolder) {		public Bitmap addBackground(Drawable appIcon, boolean isFolder) {
	BitmapDrawable bitmapDrawable;		Bitmap bitmap;
	if (appIcon instanceof BitmapDrawable) {		if (appIcon instanceof BitmapDrawable) {
	bitmapDrawable = ((BitmapDrawable) appIcon);		bitmap = ((BitmapDrawable) appIcon).getBitmap();
	} else {		} else {
	Bitmap bitmap = Bitmap.createBitmap(appIcon.getIntrinsicWidth(), appIcon.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);		bitmap = Bitmap.createBitmap(appIcon.getIntrinsicWidth(),
			appIcon.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
	Canvas canvas = new Canvas(bitmap);		Canvas canvas = new Canvas(bitmap);
			appIcon.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
	appIcon.draw(canvas);		appIcon.draw(canvas);
	bitmapDrawable = new BitmapDrawable(mContext.getResources(), bitmap);
	}		}

	bitmapDrawable.setAntiAlias(true);
	Bitmap bitmap = bitmapDrawable.getBitmap();
	return addBackground(bitmap, isFolder);		return addBackground(bitmap, isFolder);
	}		}

	@@ -224,6 +216,7 @@ public class GraphicsUtil {

	return color;		return color;
	} else {		} else {
			Log.i(TAG, "getDominantColor: white");
	return Color.WHITE;		return Color.WHITE;
	}		}
	}		}

app/src/main/java/foundation/e/blisslauncher/features/widgets/WidgetsActivity.java

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -10,15 +10,14 @@ import android.support.v7.widget.LinearLayoutManager;
	import android.support.v7.widget.RecyclerView;		import android.support.v7.widget.RecyclerView;
	import android.util.DisplayMetrics;		import android.util.DisplayMetrics;

	import foundation.e.blisslauncher.core.customviews.RoundedWidgetView;
	import foundation.e.blisslauncher.core.customviews.WidgetHost;

	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.Arrays;		import java.util.Arrays;
	import java.util.List;		import java.util.List;

	import foundation.e.blisslauncher.BlissLauncher;		import foundation.e.blisslauncher.BlissLauncher;
	import foundation.e.blisslauncher.R;		import foundation.e.blisslauncher.R;
			import foundation.e.blisslauncher.core.customviews.RoundedWidgetView;
			import foundation.e.blisslauncher.core.customviews.WidgetHost;

	public class WidgetsActivity extends Activity implements AddedWidgetsAdapter.OnActionClickListener {		public class WidgetsActivity extends Activity implements AddedWidgetsAdapter.OnActionClickListener {

build.gradle

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -10,8 +10,8 @@ buildscript {
	}		}
	dependencies {		dependencies {
	classpath 'com.android.tools.build:gradle:3.3.0'		classpath 'com.android.tools.build:gradle:3.3.0'
	classpath 'io.fabric.tools:gradle:1.25.4'		classpath 'io.fabric.tools:gradle:1.26.1'
	classpath 'com.google.gms:google-services:4.0.0'		classpath 'com.google.gms:google-services:4.2.0'
	}		}
	}		}

	@@ -40,7 +40,6 @@ subprojects {

	ext{		ext{
	compileSdkVersion = 28		compileSdkVersion = 28
	buildToolsVersion = '26.0.2'
	minSdkVersion = 24		minSdkVersion = 24
	targetSdkVersion = 28		targetSdkVersion = 28
	sourceCompatibilityVersion = '1.7'		sourceCompatibilityVersion = '1.7'