diff --git a/app/src/main/java/com/codigoparallevar/minicards/CardPreviewArrayAdapter.java b/app/src/main/java/com/codigoparallevar/minicards/CardPreviewArrayAdapter.java index 6b0aaf1..28a0997 100644 --- a/app/src/main/java/com/codigoparallevar/minicards/CardPreviewArrayAdapter.java +++ b/app/src/main/java/com/codigoparallevar/minicards/CardPreviewArrayAdapter.java @@ -61,9 +61,15 @@ class CardPreviewArrayAdapter extends ArrayAdapter { CardView cardView = (CardView) row.findViewById(R.id.card_preview_card); TextView nameView = (TextView) row.findViewById(R.id.card_preview_name); - cardView.setBackgroundColor(card.getColor()); + int backgroundColor = card.getColor(); + cardView.setBackgroundColor(backgroundColor); nameView.setText(card.getName()); - nameView.setTextColor(0xFFFFFF ^ card.getColor()); + if (backgroundColor == CardFile.DEFAULT_BACKGROUND_COLOR){ + nameView.setTextColor(0xFFF0F0F0); + } + else { + nameView.setTextColor(0xFFFFFF ^ backgroundColor); + } return row; } diff --git a/app/src/main/res/drawable-hdpi/ic_settings_gray.png b/app/src/main/res/drawable-hdpi/ic_settings_gray.png new file mode 100644 index 0000000..efc1de5 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings_gray.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_settings_gray.png b/app/src/main/res/drawable-mdpi/ic_settings_gray.png new file mode 100644 index 0000000..3331058 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_settings_gray.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_gray.png b/app/src/main/res/drawable-xhdpi/ic_settings_gray.png new file mode 100644 index 0000000..fa86bd8 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings_gray.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_gray.png b/app/src/main/res/drawable-xxhdpi/ic_settings_gray.png new file mode 100644 index 0000000..607517f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings_gray.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_gray.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_gray.png new file mode 100644 index 0000000..f8dfbbf Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_settings_gray.png differ diff --git a/app/src/main/res/layout/card_preview.xml b/app/src/main/res/layout/card_preview.xml index 5371790..fe9c125 100644 --- a/app/src/main/res/layout/card_preview.xml +++ b/app/src/main/res/layout/card_preview.xml @@ -36,6 +36,7 @@ android:layout_marginLeft="20dp" android:layout_marginTop="10dp" android:text="TextView" + android:textSize="25dp" tools:layout_editor_absoluteX="8dp" tools:layout_editor_absoluteY="3dp" /> @@ -46,8 +47,9 @@ android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_alignParentTop="true" + android:alpha="1" android:clickable="true" - android:src="@drawable/ic_settings_black" /> + android:src="@drawable/ic_settings_gray" />