mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Small color fixes

This commit is contained in:
M66B 2019-06-13 13:01:07 +02:00
parent f014d820da
commit 58d0fd071c
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/FragmentAccount.java
View File

@ -320,7 +320,7 @@ public class FragmentAccount extends FragmentBase {
} }
}); });
vwColor.setBackgroundColor(color); setColor(color);
btnColor.setOnClickListener(new View.OnClickListener() { btnColor.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -1379,7 +1379,7 @@ public class FragmentAccount extends FragmentBase {
} }
private void setColor(int color) { private void setColor(int color) {
FragmentAccount.this.color = color; this.color = color;
GradientDrawable border = new GradientDrawable(); GradientDrawable border = new GradientDrawable();
border.setColor(color); border.setColor(color);

4
app/src/main/java/eu/faircode/email/FragmentIdentity.java
View File

@ -273,7 +273,7 @@ public class FragmentIdentity extends FragmentBase {
} }
}); });
vwColor.setBackgroundColor(color); setColor(color);
btnColor.setOnClickListener(new View.OnClickListener() { btnColor.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -991,7 +991,7 @@ public class FragmentIdentity extends FragmentBase {
} }
private void setColor(int color) { private void setColor(int color) {
FragmentIdentity.this.color = color; this.color = color;
GradientDrawable border = new GradientDrawable(); GradientDrawable border = new GradientDrawable();
border.setColor(color); border.setColor(color);

15
app/src/main/java/eu/faircode/email/FragmentRule.java
View File

@ -131,7 +131,7 @@ public class FragmentRule extends FragmentBase {
private long id = -1; private long id = -1;
private long account = -1; private long account = -1;
private long folder = -1; private long folder = -1;
private Integer color = null; private int color = Color.TRANSPARENT;
private final static int MAX_CHECK = 10; private final static int MAX_CHECK = 10;
@ -289,12 +289,10 @@ public class FragmentRule extends FragmentBase {
tvActionRemark.setVisibility(View.GONE); tvActionRemark.setVisibility(View.GONE);
vwColor.setBackgroundColor(color == null ? Color.TRANSPARENT : color); setColor(color);
btnColor.setOnClickListener(new View.OnClickListener() { btnColor.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
int color = (FragmentRule.this.color == null ? Color.TRANSPARENT : FragmentRule.this.color);
int[] colors = getContext().getResources().getIntArray(R.array.colorPicker); int[] colors = getContext().getResources().getIntArray(R.array.colorPicker);
ColorPickerDialog colorPickerDialog = new ColorPickerDialog(); ColorPickerDialog colorPickerDialog = new ColorPickerDialog();
colorPickerDialog.initialize(R.string.title_flag_color, colors, color, 4, colors.length); colorPickerDialog.initialize(R.string.title_flag_color, colors, color, 4, colors.length);
@ -311,7 +309,7 @@ public class FragmentRule extends FragmentBase {
ibColorDefault.setOnClickListener(new View.OnClickListener() { ibColorDefault.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
setColor(null); setColor(Color.TRANSPARENT);
} }
}); });
@ -501,7 +499,7 @@ public class FragmentRule extends FragmentBase {
break; break;
case EntityRule.TYPE_FLAG: case EntityRule.TYPE_FLAG:
setColor(jaction.isNull("color") ? null : jaction.getInt("color")); setColor(jaction.isNull("color") ? Color.TRANSPARENT : jaction.getInt("color"));
break; break;
case EntityRule.TYPE_MOVE: case EntityRule.TYPE_MOVE:
@ -796,12 +794,9 @@ public class FragmentRule extends FragmentBase {
grpAutomation.setVisibility(type == EntityRule.TYPE_AUTOMATION ? View.VISIBLE : View.GONE); grpAutomation.setVisibility(type == EntityRule.TYPE_AUTOMATION ? View.VISIBLE : View.GONE);
} }
private void setColor(Integer color) { private void setColor(int color) {
this.color = color; this.color = color;
if (color == null)
color = Color.TRANSPARENT;
GradientDrawable border = new GradientDrawable(); GradientDrawable border = new GradientDrawable();
border.setColor(color); border.setColor(color);
border.setStroke(1, Helper.resolveColor(getContext(), R.attr.colorSeparator)); border.setStroke(1, Helper.resolveColor(getContext(), R.attr.colorSeparator));