diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java index 707fb09a7..95f1a410d 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -842,8 +842,8 @@ public class AppDetailsRecyclerViewAdapter iconDrawable = DrawableCompat.wrap(iconDrawable).mutate(); DrawableCompat.setTint(iconDrawable, Color.parseColor("#B4B4B4")); } - final Drawable expandLess = ContextCompat.getDrawable(headerView.getContext(), R.drawable.ic_expand_less_grey600); - final Drawable expandMore = ContextCompat.getDrawable(headerView.getContext(), R.drawable.ic_expand_more_grey600); + final Drawable expandLess = ContextCompat.getDrawable(headerView.getContext(), R.drawable.ic_expand_less); + final Drawable expandMore = ContextCompat.getDrawable(headerView.getContext(), R.drawable.ic_expand_more); TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(headerView, iconDrawable, null, isExpanded ? expandLess : expandMore, null); } @@ -1300,7 +1300,7 @@ public class AppDetailsRecyclerViewAdapter expandedLayout.setVisibility(expand ? View.VISIBLE : View.GONE); versionCode.setVisibility(expand ? View.VISIBLE : View.GONE); expandArrow.setImageDrawable(ContextCompat.getDrawable(context, expand ? - R.drawable.ic_expand_less_grey600 : R.drawable.ic_expand_more_grey600)); + R.drawable.ic_expand_less : R.drawable.ic_expand_more)); // This is required to make these labels // auto-scrollable when they are too long diff --git a/app/src/main/res/drawable-hdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-hdpi/ic_expand_less_grey600.png deleted file mode 100644 index 2108ad2c0..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_expand_less_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-hdpi/ic_expand_more_grey600.png deleted file mode 100644 index 0a4f1ea16..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_expand_more_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-mdpi/ic_expand_less_grey600.png deleted file mode 100644 index a91d29870..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_expand_less_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-mdpi/ic_expand_more_grey600.png deleted file mode 100644 index 8cae8615b..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_expand_more_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-xhdpi/ic_expand_less_grey600.png deleted file mode 100644 index 34a759431..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_expand_less_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-xhdpi/ic_expand_more_grey600.png deleted file mode 100644 index 7b3b4a25d..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_expand_more_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-xxhdpi/ic_expand_less_grey600.png deleted file mode 100644 index b4db05919..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_expand_less_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-xxhdpi/ic_expand_more_grey600.png deleted file mode 100644 index 67487be3d..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_expand_more_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_less_grey600.png deleted file mode 100644 index f907e97c5..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_expand_less_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_more_grey600.png deleted file mode 100644 index e3c993ee7..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_expand_more_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_expand_less.xml b/app/src/main/res/drawable/ic_expand_less.xml new file mode 100644 index 000000000..c1d4ac5bb --- /dev/null +++ b/app/src/main/res/drawable/ic_expand_less.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_expand_more.xml b/app/src/main/res/drawable/ic_expand_more.xml new file mode 100644 index 000000000..e6aa60301 --- /dev/null +++ b/app/src/main/res/drawable/ic_expand_more.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/app_details2_links.xml b/app/src/main/res/layout/app_details2_links.xml index 0eed84127..01263d8a6 100644 --- a/app/src/main/res/layout/app_details2_links.xml +++ b/app/src/main/res/layout/app_details2_links.xml @@ -27,8 +27,8 @@ android:paddingStart="@dimen/details_activity__collapsable_lists__padding__horizontal" android:paddingRight="@dimen/details_activity__collapsable_lists__padding__horizontal" android:paddingEnd="@dimen/details_activity__collapsable_lists__padding__horizontal" - android:drawableRight="@drawable/ic_expand_more_grey600" - android:drawableEnd="@drawable/ic_expand_more_grey600" + android:drawableRight="@drawable/ic_expand_more" + android:drawableEnd="@drawable/ic_expand_more" android:drawableLeft="@drawable/ic_website" android:drawableStart="@drawable/ic_website" android:background="?selectableItemBackground" /> diff --git a/app/src/main/res/layout/app_details2_version_item.xml b/app/src/main/res/layout/app_details2_version_item.xml index 452f8cd64..6c5619096 100644 --- a/app/src/main/res/layout/app_details2_version_item.xml +++ b/app/src/main/res/layout/app_details2_version_item.xml @@ -84,7 +84,7 @@ + android:src="@drawable/ic_expand_more" />