mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-01 06:11:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use DrawableCompat tinting instead

Browse Source
This commit is contained in:
Sylvia van Os
2019-12-15 21:29:34 +01:00
parent a642b12795
commit 280fe76609
30 changed files with 28 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
View File

@@ -4,12 +4,16 @@ package protect.card_locker;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v4.graphics.ColorUtils;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.support.v4.widget.TextViewCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.content.res.AppCompatResources;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.util.TypedValue;
@@ -55,6 +59,22 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
Log.d(TAG, "View activity: id=" + loyaltyCardId);
}
private Drawable getIcon(int icon, boolean dark)
{
Drawable unwrappedIcon = AppCompatResources.getDrawable(this, icon);
Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
if(dark)
{
DrawableCompat.setTint(wrappedIcon, Color.BLACK);
}
else
{
DrawableCompat.setTintList(wrappedIcon, null);
}
return wrappedIcon;
}
@Override
protected void onCreate(Bundle savedInstanceState)
{
@@ -171,13 +191,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
// If the background is very bright, we should use dark icons
backgroundNeedsDarkIcons = (ColorUtils.calculateLuminance(backgroundHeaderColor) > LUMINANCE_MIDPOINT);
if(backgroundNeedsDarkIcons)
ActionBar actionBar = getSupportActionBar();
if(actionBar != null)
{
ActionBar actionBar = getSupportActionBar();
if(actionBar != null)
{
actionBar.setHomeAsUpIndicator(R.drawable.ic_arrow_back_black);
}
actionBar.setHomeAsUpIndicator(getIcon(R.drawable.ic_arrow_back_white, backgroundNeedsDarkIcons));
}
if(barcodeImage.getHeight() == 0)
@@ -227,11 +244,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
item.setVisible(false);
}
if(backgroundNeedsDarkIcons)
{
menu.findItem(R.id.action_share).setIcon(R.drawable.ic_share_black);
menu.findItem(R.id.action_edit).setIcon(R.drawable.ic_mode_edit_black_24dp);
}
menu.findItem(R.id.action_share).setIcon(getIcon(R.drawable.ic_share_white, backgroundNeedsDarkIcons));
menu.findItem(R.id.action_edit).setIcon(getIcon(R.drawable.ic_mode_edit_white_24dp, backgroundNeedsDarkIcons));
return super.onCreateOptionsMenu(menu);
}
@@ -281,27 +295,14 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
{
if(lock)
{
if(backgroundNeedsDarkIcons)
{
item.setIcon(R.drawable.ic_lock_outline_black_24dp);
}
else
{
item.setIcon(R.drawable.ic_lock_outline_white_24dp);
}
item.setIcon(getIcon(R.drawable.ic_lock_outline_white_24dp, backgroundNeedsDarkIcons));
item.setTitle(R.string.unlockScreen);
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
}
else
{
if(backgroundNeedsDarkIcons)
{
item.setIcon(R.drawable.ic_lock_open_black_24dp);
}
else
{
item.setIcon(R.drawable.ic_lock_open_white_24dp);
}
item.setIcon(getIcon(R.drawable.ic_lock_open_white_24dp, backgroundNeedsDarkIcons));
item.setTitle(R.string.lockScreen);
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
}