Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'permission-group-icon-color' into 'master'

Browse Source 
Change color of permission group icons in alert dialog according to theme

See merge request fdroid/fdroidclient!611
This commit is contained in:
Peter Serwylo 2017-11-11 21:33:48 +00:00
commit b86723be44
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
View File

@ -26,10 +26,12 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionGroupInfo;
import android.content.pm.PermissionInfo; import android.content.pm.PermissionInfo;
import android.graphics.Color;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.TextUtils; import android.text.TextUtils;
@ -42,6 +44,7 @@ import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import java.text.Collator; import java.text.Collator;
@ -107,10 +110,17 @@ public class AppSecurityPermissions {
@TargetApi(22) @TargetApi(22)
public Drawable loadGroupIcon(Context context, PackageManager pm) { public Drawable loadGroupIcon(Context context, PackageManager pm) {
Drawable iconDrawable;
if (icon != 0) { if (icon != 0) {
return (Build.VERSION.SDK_INT < 22) ? loadIcon(pm) : loadUnbadgedIcon(pm); iconDrawable = (Build.VERSION.SDK_INT < 22) ? loadIcon(pm) : loadUnbadgedIcon(pm);
} else {
iconDrawable = ContextCompat.getDrawable(context, R.drawable.ic_perm_device_info);
} }
return ContextCompat.getDrawable(context, R.drawable.ic_perm_device_info);
Preferences.Theme theme = Preferences.get().getTheme();
Drawable wrappedIconDrawable = DrawableCompat.wrap(iconDrawable).mutate();
DrawableCompat.setTint(wrappedIconDrawable, theme == Preferences.Theme.light ? Color.BLACK : Color.WHITE);
return wrappedIconDrawable;
} }
} }