From 3e4beae63153957cf8384c80240068a57f2de094 Mon Sep 17 00:00:00 2001 From: cketti Date: Fri, 12 Sep 2014 06:26:03 +0200 Subject: [PATCH] Remove unused 'check mark' color chip --- src/com/fsck/k9/Account.java | 10 ---------- src/com/fsck/k9/view/ColorChip.java | 17 +++-------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java index a497e1124..54297b580 100644 --- a/src/com/fsck/k9/Account.java +++ b/src/com/fsck/k9/Account.java @@ -221,7 +221,6 @@ public class Account implements BaseAccount { private ColorChip mFlaggedUnreadColorChip; private ColorChip mFlaggedReadColorChip; - private ColorChip mCheckmarkChip; /** @@ -862,11 +861,6 @@ public class Account implements BaseAccount { mUnreadColorChip = new ColorChip(mChipColor, false, ColorChip.CIRCULAR); mFlaggedReadColorChip = new ColorChip(mChipColor, true, ColorChip.STAR); mFlaggedUnreadColorChip = new ColorChip(mChipColor, false, ColorChip.STAR); - mCheckmarkChip = new ColorChip(mChipColor, true, ColorChip.CHECKMARK); - } - - public ColorChip getCheckmarkChip() { - return mCheckmarkChip; } public synchronized int getChipColor() { @@ -895,10 +889,6 @@ public class Account implements BaseAccount { return chip; } - public ColorChip generateColorChip() { - return new ColorChip(mChipColor, false, ColorChip.CIRCULAR); - } - @Override public String getUuid() { return mUuid; diff --git a/src/com/fsck/k9/view/ColorChip.java b/src/com/fsck/k9/view/ColorChip.java index 3dcbeddc7..c07de65ac 100644 --- a/src/com/fsck/k9/view/ColorChip.java +++ b/src/com/fsck/k9/view/ColorChip.java @@ -12,7 +12,6 @@ public class ColorChip { public static final Path RIGHT_POINTING = new Path(); public static final Path RIGHT_NOTCH = new Path(); public static final Path STAR = new Path(); - public static final Path CHECKMARK = new Path(); static { @@ -47,12 +46,6 @@ public class ColorChip { STAR.lineTo(110f,110f); STAR.lineTo(140f,60f); STAR.close(); - - - CHECKMARK.moveTo(10f,160f); - CHECKMARK.lineTo(120f,280f); - CHECKMARK.lineTo(300f,40f); - } private ShapeDrawable mDrawable; @@ -66,11 +59,7 @@ public class ColorChip { } else { mDrawable = new ShapeDrawable(new PathShape(shape, 320f, 320f)); } - if (shape.equals(CHECKMARK)) { - mDrawable.getPaint().setStrokeWidth(50); - } else { - mDrawable.getPaint().setStrokeWidth(20); - } + if (messageRead) { // Read messages get an outlined circle mDrawable.getPaint().setStyle(Paint.Style.STROKE); @@ -79,9 +68,9 @@ public class ColorChip { mDrawable.getPaint().setStyle(Paint.Style.FILL_AND_STROKE); } + + mDrawable.getPaint().setStrokeWidth(20); mDrawable.getPaint().setColor(color); - - } public ShapeDrawable drawable() {