Skip to content

Commit 61dd36a

Browse files
author
Tom James Holub
committed
updated chip colors | #77
1 parent 603f233 commit 61dd36a

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/SecureComposeFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ private void initChipsView(View view) {
296296
SingleCharacterSpanChipTokenizer.CHIP_SEPARATOR_WHITESPACE));
297297
recipientEditTextView.setOnFocusChangeListener(this);
298298
recipientEditTextView.setChipBackground(
299-
ColorStateList.valueOf(UIUtil.getColor(getContext(), R.color.gray)));
299+
ColorStateList.valueOf(UIUtil.getColor(getContext(), R.color.aluminum)));
300300
}
301301

302302
/**

FlowCrypt/src/main/java/com/flowcrypt/email/ui/widget/CustomChipSpanChipCreator.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,16 @@ public CustomChipSpanChipCreator(Context context) {
4545
*/
4646
public static void updateChipSpanBackground(Context context, @NonNull ChipSpan chipSpan,
4747
boolean isHasPgp) {
48-
int color;
48+
int backgroundColor, textColor;
4949
if (isHasPgp) {
50-
color = UIUtil.getColor(context, R.color.colorPrimary);
50+
backgroundColor = UIUtil.getColor(context, R.color.colorPrimary);
51+
textColor = UIUtil.getColor(context, android.R.color.white);
5152
} else {
52-
color = UIUtil.getColor(context, R.color.gray);
53+
backgroundColor = UIUtil.getColor(context, R.color.aluminum);
54+
textColor = UIUtil.getColor(context, R.color.dark);
5355
}
54-
chipSpan.setBackgroundColor(ColorStateList.valueOf(color));
56+
chipSpan.setBackgroundColor(ColorStateList.valueOf(backgroundColor));
57+
chipSpan.setTextColor(textColor);
5558
}
5659

5760
@Override

FlowCrypt/src/main/res/layout/activity_feedback.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
android:layout_width="0dp"
3939
android:layout_height="@dimen/default_single_dip"
4040
android:layout_marginBottom="@dimen/default_margin_content"
41-
android:background="@color/silver"
41+
android:background="@color/aluminum"
4242
app:layout_constraintBottom_toTopOf="@+id/textViewAuthorHint"
4343
app:layout_constraintHorizontal_bias="0.0"
4444
app:layout_constraintLeft_toLeftOf="parent"

FlowCrypt/src/main/res/layout/activity_keys_settings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
android:id="@+id/listViewKeys"
3636
android:layout_width="match_parent"
3737
android:layout_height="match_parent"
38-
android:divider="@color/silver"
38+
android:divider="@color/aluminum"
3939
android:dividerHeight="1dp"
4040
tools:listitem="@layout/key_item" />
4141

0 commit comments

Comments
 (0)