diff --git a/app/src/main/java/org/kore/kolabnotes/android/adapter/NoteAdapter.java b/app/src/main/java/org/kore/kolabnotes/android/adapter/NoteAdapter.java index 7ab3a9d..f6333a0 100755 --- a/app/src/main/java/org/kore/kolabnotes/android/adapter/NoteAdapter.java +++ b/app/src/main/java/org/kore/kolabnotes/android/adapter/NoteAdapter.java @@ -5,6 +5,7 @@ import android.support.v7.widget.CardView; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; +import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.view.ViewParent; @@ -27,6 +28,12 @@ public class NoteAdapter extends RecyclerView.Adapter { private Context context; private NoteSelectedListener listener; private DateFormat dateFormatter; + private static final int CYAN = 210; + private static final int RED = 0; + private static final int RED_ORANGE = 20; + private static final int HUE = 0; + private static final int SATURATION = 1; + private static final int BRIGHTNESS = 2; public NoteAdapter(List notes, int rowLayout, Context context, NoteSelectedListener listener) { this.notes = notes; @@ -87,6 +94,30 @@ public void onBindViewHolder(final ViewHolder viewHolder, int i) { viewHolder.modificationDate.setBackgroundColor(Color.parseColor(note.getColor().getHexcode())); viewHolder.categories.setBackgroundColor(Color.parseColor(note.getColor().getHexcode())); + /* + * Text color depending on background color. + */ + float[] HSV = new float[3]; + Color.colorToHSV(Color.parseColor(note.getColor().getHexcode()), HSV); + + /* + * If spectrum from cyan to red and saturation greater than or equal to 0.5 - text is white. + * If spectrum is not included in these borders or brightness greater than or equal to 0.8 - text is black. + */ + if (((HSV[HUE] >= CYAN || (HSV[HUE] >= RED && HSV[HUE] <= RED_ORANGE)) && HSV[SATURATION] >= 0.5) || HSV[BRIGHTNESS] <= 0.8) { + viewHolder.name.setTextColor(Color.WHITE); + viewHolder.classification.setTextColor(Color.WHITE); + viewHolder.createdDate.setTextColor(Color.WHITE); + viewHolder.modificationDate.setTextColor(Color.WHITE); + viewHolder.categories.setTextColor(Color.WHITE); + } else { + viewHolder.name.setTextColor(Color.BLACK); + viewHolder.classification.setTextColor(Color.GRAY); + viewHolder.createdDate.setTextColor(Color.GRAY); + viewHolder.modificationDate.setTextColor(Color.GRAY); + viewHolder.categories.setTextColor(Color.BLACK); + } + }else{ viewHolder.cardView.setCardBackgroundColor(Color.WHITE); viewHolder.name.setBackgroundColor(Color.WHITE); @@ -94,6 +125,12 @@ public void onBindViewHolder(final ViewHolder viewHolder, int i) { viewHolder.createdDate.setBackgroundColor(Color.WHITE); viewHolder.modificationDate.setBackgroundColor(Color.WHITE); viewHolder.categories.setBackgroundColor(Color.WHITE); + + viewHolder.name.setTextColor(Color.BLACK); + viewHolder.classification.setTextColor(Color.GRAY); + viewHolder.createdDate.setTextColor(Color.GRAY); + viewHolder.modificationDate.setTextColor(Color.GRAY); + viewHolder.categories.setTextColor(Color.BLACK); } Utils.setElevation(viewHolder.cardView,5); diff --git a/app/src/main/res/drawable-hdpi/ic_action_accept.png b/app/src/main/res/drawable-hdpi/ic_action_accept.png index 700fc81..862f4a0 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_accept.png and b/app/src/main/res/drawable-hdpi/ic_action_accept.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_add_person.png b/app/src/main/res/drawable-hdpi/ic_action_add_person.png index 9d88d0f..1e3b9bd 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_add_person.png and b/app/src/main/res/drawable-hdpi/ic_action_add_person.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_choose_color.png b/app/src/main/res/drawable-hdpi/ic_action_choose_color.png index 3693fa0..34f1f02 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_choose_color.png and b/app/src/main/res/drawable-hdpi/ic_action_choose_color.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_collection.png b/app/src/main/res/drawable-hdpi/ic_action_collection.png index 8de9117..fb03035 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_collection.png and b/app/src/main/res/drawable-hdpi/ic_action_collection.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_collection_new.png b/app/src/main/res/drawable-hdpi/ic_action_collection_new.png index 1f00e09..d16e45b 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_collection_new.png and b/app/src/main/res/drawable-hdpi/ic_action_collection_new.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_collection_remove.png b/app/src/main/res/drawable-hdpi/ic_action_collection_remove.png index c204d13..3e77c70 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_collection_remove.png and b/app/src/main/res/drawable-hdpi/ic_action_collection_remove.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_discard.png b/app/src/main/res/drawable-hdpi/ic_action_discard.png index 703b31f..388b5b0 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_discard.png and b/app/src/main/res/drawable-hdpi/ic_action_discard.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_edit.png b/app/src/main/res/drawable-hdpi/ic_action_edit.png index 756db31..47d2ad4 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_edit.png and b/app/src/main/res/drawable-hdpi/ic_action_edit.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_group.png b/app/src/main/res/drawable-hdpi/ic_action_group.png index 271980b..3d2068c 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_group.png and b/app/src/main/res/drawable-hdpi/ic_action_group.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_labels.png b/app/src/main/res/drawable-hdpi/ic_action_labels.png index c4909ae..09e82bf 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_labels.png and b/app/src/main/res/drawable-hdpi/ic_action_labels.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_labels_white.png b/app/src/main/res/drawable-hdpi/ic_action_labels_white.png index 0183327..4bfcdf1 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_labels_white.png and b/app/src/main/res/drawable-hdpi/ic_action_labels_white.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_new.png b/app/src/main/res/drawable-hdpi/ic_action_new.png index d866d61..9b6ae3f 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_new.png and b/app/src/main/res/drawable-hdpi/ic_action_new.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_new_label.png b/app/src/main/res/drawable-hdpi/ic_action_new_label.png index a615f39..ebcbe15 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_new_label.png and b/app/src/main/res/drawable-hdpi/ic_action_new_label.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_not_secure.png b/app/src/main/res/drawable-hdpi/ic_action_not_secure.png index 2c91761..323e3b8 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_not_secure.png and b/app/src/main/res/drawable-hdpi/ic_action_not_secure.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_person.png b/app/src/main/res/drawable-hdpi/ic_action_person.png index 9fd8109..52f342d 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_person.png and b/app/src/main/res/drawable-hdpi/ic_action_person.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_search.png b/app/src/main/res/drawable-hdpi/ic_action_search.png index 772e359..1b948bc 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_search.png and b/app/src/main/res/drawable-hdpi/ic_action_search.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_select_all.png b/app/src/main/res/drawable-hdpi/ic_action_select_all.png index fc0dd57..7f5e2d7 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_select_all.png and b/app/src/main/res/drawable-hdpi/ic_action_select_all.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_settings.png b/app/src/main/res/drawable-hdpi/ic_action_settings.png index 0eb78f7..a8985bc 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_settings.png and b/app/src/main/res/drawable-hdpi/ic_action_settings.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_share.png b/app/src/main/res/drawable-hdpi/ic_action_share.png index a36464b..c6f1ba9 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_share.png and b/app/src/main/res/drawable-hdpi/ic_action_share.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_sort_by_size.png b/app/src/main/res/drawable-hdpi/ic_action_sort_by_size.png index f0c1bee..be5a712 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_sort_by_size.png and b/app/src/main/res/drawable-hdpi/ic_action_sort_by_size.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_accept.png b/app/src/main/res/drawable-mdpi/ic_action_accept.png index 41107b8..4566ea7 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_accept.png and b/app/src/main/res/drawable-mdpi/ic_action_accept.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_add_person.png b/app/src/main/res/drawable-mdpi/ic_action_add_person.png index b7d8f46..80f1e37 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_add_person.png and b/app/src/main/res/drawable-mdpi/ic_action_add_person.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_choose_color.png b/app/src/main/res/drawable-mdpi/ic_action_choose_color.png index 5ac80f1..6c58079 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_choose_color.png and b/app/src/main/res/drawable-mdpi/ic_action_choose_color.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_collection.png b/app/src/main/res/drawable-mdpi/ic_action_collection.png index b89ea93..cf46058 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_collection.png and b/app/src/main/res/drawable-mdpi/ic_action_collection.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_collection_new.png b/app/src/main/res/drawable-mdpi/ic_action_collection_new.png index 32267fa..ad60888 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_collection_new.png and b/app/src/main/res/drawable-mdpi/ic_action_collection_new.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_collection_remove.png b/app/src/main/res/drawable-mdpi/ic_action_collection_remove.png index e4e00a3..ac9191a 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_collection_remove.png and b/app/src/main/res/drawable-mdpi/ic_action_collection_remove.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_discard.png b/app/src/main/res/drawable-mdpi/ic_action_discard.png index 248fb09..4a9f769 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_discard.png and b/app/src/main/res/drawable-mdpi/ic_action_discard.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_edit.png b/app/src/main/res/drawable-mdpi/ic_action_edit.png index 68a4532..996ce63 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_edit.png and b/app/src/main/res/drawable-mdpi/ic_action_edit.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_group.png b/app/src/main/res/drawable-mdpi/ic_action_group.png index 06dbeec..96f4c5f 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_group.png and b/app/src/main/res/drawable-mdpi/ic_action_group.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_labels.png b/app/src/main/res/drawable-mdpi/ic_action_labels.png index 4b0a113..fb7c87f 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_labels.png and b/app/src/main/res/drawable-mdpi/ic_action_labels.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_labels_white.png b/app/src/main/res/drawable-mdpi/ic_action_labels_white.png index 082af3c..1c5acf5 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_labels_white.png and b/app/src/main/res/drawable-mdpi/ic_action_labels_white.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_new.png b/app/src/main/res/drawable-mdpi/ic_action_new.png index f17e798..7ec58c9 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_new.png and b/app/src/main/res/drawable-mdpi/ic_action_new.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_new_label.png b/app/src/main/res/drawable-mdpi/ic_action_new_label.png index f4281c3..8d2f805 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_new_label.png and b/app/src/main/res/drawable-mdpi/ic_action_new_label.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_not_secure.png b/app/src/main/res/drawable-mdpi/ic_action_not_secure.png index faffa23..057087a 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_not_secure.png and b/app/src/main/res/drawable-mdpi/ic_action_not_secure.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_person.png b/app/src/main/res/drawable-mdpi/ic_action_person.png index 359da1c..3a17344 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_person.png and b/app/src/main/res/drawable-mdpi/ic_action_person.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_search.png b/app/src/main/res/drawable-mdpi/ic_action_search.png index 4edb1ff..05c773f 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_search.png and b/app/src/main/res/drawable-mdpi/ic_action_search.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_select_all.png b/app/src/main/res/drawable-mdpi/ic_action_select_all.png index da37d7a..31f2d6d 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_select_all.png and b/app/src/main/res/drawable-mdpi/ic_action_select_all.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_settings.png b/app/src/main/res/drawable-mdpi/ic_action_settings.png index c290e59..378afb1 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_settings.png and b/app/src/main/res/drawable-mdpi/ic_action_settings.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_share.png b/app/src/main/res/drawable-mdpi/ic_action_share.png index 7362f0d..cf977af 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_share.png and b/app/src/main/res/drawable-mdpi/ic_action_share.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_sort_by_size.png b/app/src/main/res/drawable-mdpi/ic_action_sort_by_size.png index a8dbd95..8583c12 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_sort_by_size.png and b/app/src/main/res/drawable-mdpi/ic_action_sort_by_size.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_accept.png b/app/src/main/res/drawable-xhdpi/ic_action_accept.png index 6ee32b6..df57798 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_accept.png and b/app/src/main/res/drawable-xhdpi/ic_action_accept.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_add_person.png b/app/src/main/res/drawable-xhdpi/ic_action_add_person.png index 4e8de1b..3f341c6 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_add_person.png and b/app/src/main/res/drawable-xhdpi/ic_action_add_person.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_choose_color.png b/app/src/main/res/drawable-xhdpi/ic_action_choose_color.png index 1ef2a73..d7a6e80 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_choose_color.png and b/app/src/main/res/drawable-xhdpi/ic_action_choose_color.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_collection.png b/app/src/main/res/drawable-xhdpi/ic_action_collection.png index 88240fd..d2e14a8 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_collection.png and b/app/src/main/res/drawable-xhdpi/ic_action_collection.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_collection_new.png b/app/src/main/res/drawable-xhdpi/ic_action_collection_new.png index bb516c7..924f72e 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_collection_new.png and b/app/src/main/res/drawable-xhdpi/ic_action_collection_new.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_collection_remove.png b/app/src/main/res/drawable-xhdpi/ic_action_collection_remove.png index 23fd207..793321e 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_collection_remove.png and b/app/src/main/res/drawable-xhdpi/ic_action_collection_remove.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_discard.png b/app/src/main/res/drawable-xhdpi/ic_action_discard.png index 9eeeed1..afa1f9a 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_discard.png and b/app/src/main/res/drawable-xhdpi/ic_action_discard.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_edit.png b/app/src/main/res/drawable-xhdpi/ic_action_edit.png index 67e056f..c1eb32e 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_edit.png and b/app/src/main/res/drawable-xhdpi/ic_action_edit.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_group.png b/app/src/main/res/drawable-xhdpi/ic_action_group.png index ea3f24e..76069a6 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_group.png and b/app/src/main/res/drawable-xhdpi/ic_action_group.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_labels.png b/app/src/main/res/drawable-xhdpi/ic_action_labels.png index 5e65adb..9e36df5 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_labels.png and b/app/src/main/res/drawable-xhdpi/ic_action_labels.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_labels_white.png b/app/src/main/res/drawable-xhdpi/ic_action_labels_white.png index d25eb3a..6c23524 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_labels_white.png and b/app/src/main/res/drawable-xhdpi/ic_action_labels_white.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_new.png b/app/src/main/res/drawable-xhdpi/ic_action_new.png index dde2141..87e6385 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_new.png and b/app/src/main/res/drawable-xhdpi/ic_action_new.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_new_label.png b/app/src/main/res/drawable-xhdpi/ic_action_new_label.png index 3d3a72a..4e23baf 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_new_label.png and b/app/src/main/res/drawable-xhdpi/ic_action_new_label.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_not_secure.png b/app/src/main/res/drawable-xhdpi/ic_action_not_secure.png index c0902a0..7635d40 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_not_secure.png and b/app/src/main/res/drawable-xhdpi/ic_action_not_secure.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_person.png b/app/src/main/res/drawable-xhdpi/ic_action_person.png index 03eeb8d..0abe90c 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_person.png and b/app/src/main/res/drawable-xhdpi/ic_action_person.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_search.png b/app/src/main/res/drawable-xhdpi/ic_action_search.png index 19658e4..5e7ba77 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_search.png and b/app/src/main/res/drawable-xhdpi/ic_action_search.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_select_all.png b/app/src/main/res/drawable-xhdpi/ic_action_select_all.png index af37a36..090f4c3 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_select_all.png and b/app/src/main/res/drawable-xhdpi/ic_action_select_all.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_settings.png b/app/src/main/res/drawable-xhdpi/ic_action_settings.png index 999d0f0..786656b 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_settings.png and b/app/src/main/res/drawable-xhdpi/ic_action_settings.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_share.png b/app/src/main/res/drawable-xhdpi/ic_action_share.png index 40771e4..ab499c9 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_share.png and b/app/src/main/res/drawable-xhdpi/ic_action_share.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_sort_by_size.png b/app/src/main/res/drawable-xhdpi/ic_action_sort_by_size.png index 700b976..4a26d7c 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_sort_by_size.png and b/app/src/main/res/drawable-xhdpi/ic_action_sort_by_size.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_accept.png b/app/src/main/res/drawable-xxhdpi/ic_action_accept.png index 68c41de..27cc0d4 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_accept.png and b/app/src/main/res/drawable-xxhdpi/ic_action_accept.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_add_person.png b/app/src/main/res/drawable-xxhdpi/ic_action_add_person.png index e9a58ea..95a6803 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_add_person.png and b/app/src/main/res/drawable-xxhdpi/ic_action_add_person.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_choose_color.png b/app/src/main/res/drawable-xxhdpi/ic_action_choose_color.png index edcc7b1..f20515c 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_choose_color.png and b/app/src/main/res/drawable-xxhdpi/ic_action_choose_color.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_collection.png b/app/src/main/res/drawable-xxhdpi/ic_action_collection.png index c41ca8c..ca8eaa2 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_collection.png and b/app/src/main/res/drawable-xxhdpi/ic_action_collection.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_collection_new.png b/app/src/main/res/drawable-xxhdpi/ic_action_collection_new.png index a13fe6f..4582706 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_collection_new.png and b/app/src/main/res/drawable-xxhdpi/ic_action_collection_new.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_collection_remove.png b/app/src/main/res/drawable-xxhdpi/ic_action_collection_remove.png index 372de37..961abff 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_collection_remove.png and b/app/src/main/res/drawable-xxhdpi/ic_action_collection_remove.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_discard.png b/app/src/main/res/drawable-xxhdpi/ic_action_discard.png index cb1260a..fbd0ec2 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_discard.png and b/app/src/main/res/drawable-xxhdpi/ic_action_discard.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_edit.png b/app/src/main/res/drawable-xxhdpi/ic_action_edit.png index 3a241ea..34a1f1a 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_edit.png and b/app/src/main/res/drawable-xxhdpi/ic_action_edit.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_group.png b/app/src/main/res/drawable-xxhdpi/ic_action_group.png index 6ef9b12..a103fe7 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_group.png and b/app/src/main/res/drawable-xxhdpi/ic_action_group.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_labels.png b/app/src/main/res/drawable-xxhdpi/ic_action_labels.png index cfd237f..8b04d22 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_labels.png and b/app/src/main/res/drawable-xxhdpi/ic_action_labels.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_labels_white.png b/app/src/main/res/drawable-xxhdpi/ic_action_labels_white.png index e4e2fb8..197529b 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_labels_white.png and b/app/src/main/res/drawable-xxhdpi/ic_action_labels_white.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_new.png b/app/src/main/res/drawable-xxhdpi/ic_action_new.png index c42c2bf..f8d0ee4 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_new.png and b/app/src/main/res/drawable-xxhdpi/ic_action_new.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_new_label.png b/app/src/main/res/drawable-xxhdpi/ic_action_new_label.png index 6225810..e0dbf93 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_new_label.png and b/app/src/main/res/drawable-xxhdpi/ic_action_new_label.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_not_secure.png b/app/src/main/res/drawable-xxhdpi/ic_action_not_secure.png index a186f1f..60460f5 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_not_secure.png and b/app/src/main/res/drawable-xxhdpi/ic_action_not_secure.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_person.png b/app/src/main/res/drawable-xxhdpi/ic_action_person.png index fd1bcdd..c342509 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_person.png and b/app/src/main/res/drawable-xxhdpi/ic_action_person.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_search.png b/app/src/main/res/drawable-xxhdpi/ic_action_search.png index a108638..08faaa1 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_search.png and b/app/src/main/res/drawable-xxhdpi/ic_action_search.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_select_all.png b/app/src/main/res/drawable-xxhdpi/ic_action_select_all.png index aa5937e..08c0276 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_select_all.png and b/app/src/main/res/drawable-xxhdpi/ic_action_select_all.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_settings.png b/app/src/main/res/drawable-xxhdpi/ic_action_settings.png index 530227e..316d023 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_settings.png and b/app/src/main/res/drawable-xxhdpi/ic_action_settings.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_share.png b/app/src/main/res/drawable-xxhdpi/ic_action_share.png index 22ed428..e744287 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_share.png and b/app/src/main/res/drawable-xxhdpi/ic_action_share.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_sort_by_size.png b/app/src/main/res/drawable-xxhdpi/ic_action_sort_by_size.png index fed4086..140fa04 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_sort_by_size.png and b/app/src/main/res/drawable-xxhdpi/ic_action_sort_by_size.png differ diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml index 540178d..793b0ab 100644 --- a/app/src/main/res/layout/fragment_detail.xml +++ b/app/src/main/res/layout/fragment_detail.xml @@ -8,6 +8,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/background_material_light" android:weightSum="1"> -