Skip to content

feat: Refactor icon pack system #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
SuperDragonXD wants to merge 1 commit into
base: 16-dev
Choose a base branch
from
Draft

feat: Refactor icon pack system #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions iconloaderlib/src/com/android/launcher3/icons/IconProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
import android.graphics.drawable.Drawable;
import android.graphics.drawable.InsetDrawable;
import android.os.Build;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.os.Bundle;
import android.os.Handler;
import android.os.Process;
Expand All @@ -58,9 +56,7 @@
import java.util.Calendar;
import java.util.Objects;

// Lawnchair-TODO: NO-OP IconProvider
import app.lawnchair.icons.CustomAdaptiveIconDrawable;
import app.lawnchair.icons.IconPreferencesKt;

/**
* Class to handle icon loading from different packages
Expand All @@ -76,8 +72,8 @@ public class IconProvider {
private static final String SYSTEM_STATE_SEPARATOR = " ";

protected final Context mContext;
private final ComponentName mCalendar;
private final ComponentName mClock;
protected final ComponentName mCalendar;
protected final ComponentName mClock;

@NonNull
protected String mSystemState = "";
Expand Down Expand Up @@ -157,9 +153,11 @@ public Drawable getIcon(PackageItemInfo info, ApplicationInfo appInfo, int iconD
if (icon == null) {
icon = loadPackageIcon(info, appInfo, iconDpi);
if (ATLEAST_T && icon instanceof AdaptiveIconDrawable && td != null) {
AdaptiveIconDrawable aid = (AdaptiveIconDrawable) icon;
CustomAdaptiveIconDrawable aid = (CustomAdaptiveIconDrawable) CustomAdaptiveIconDrawable.wrapNonNull(
icon
);
if (aid.getMonochrome() == null) {
icon = new AdaptiveIconDrawable(aid.getBackground(),
icon = new CustomAdaptiveIconDrawable(aid.getBackground(),
aid.getForeground(), td.loadPaddedDrawable());
}
}
Expand All @@ -171,7 +169,7 @@ protected ThemeData getThemeDataForPackage(String packageName) {
return null;
}

private Drawable loadPackageIcon(PackageItemInfo info, ApplicationInfo appInfo, int density) {
protected Drawable loadPackageIcon(PackageItemInfo info, ApplicationInfo appInfo, int density) {
Drawable icon = null;
if (BuildCompat.isAtLeastV() && info.isArchived) {
// Icons for archived apps com from system service, let the default impl handle that
Expand Down Expand Up @@ -205,7 +203,7 @@ protected Drawable loadAppInfoIcon(ApplicationInfo info, Resources resources, in
}

@TargetApi(Build.VERSION_CODES.TIRAMISU)
private Drawable loadCalendarDrawable(int iconDpi, @Nullable ThemeData td) {
protected Drawable loadCalendarDrawable(int iconDpi, @Nullable ThemeData td) {
PackageManager pm = mContext.getPackageManager();
try {
final Bundle metadata = pm.getActivityInfo(
Expand Down Expand Up @@ -290,7 +288,7 @@ public void updateSystemState() {
/**
* @return Today's day of the month, zero-indexed.
*/
private static int getDay() {
protected static int getDay() {
return Calendar.getInstance().get(Calendar.DAY_OF_MONTH) - 1;
}

Expand Down