From c81c7c24011fcfc1ba4764e62d34434b1d13b293 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Mon, 16 Nov 2020 09:07:42 +0100 Subject: Fix #729 BottomNavigation in attachment picker is not colored when branding is disabled Signed-off-by: Stefan Niedermann --- .../nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java | 6 +++--- fastlane/metadata/android/en-US/changelogs/1012002.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/1012002.txt diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java index bb42f27ef..81a166cb6 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java @@ -233,9 +233,9 @@ public class CardAttachmentsFragment extends BrandedFragment implements Attachme binding.emptyContentView.hideDescription(); } @Nullable Context context = requireContext(); - if (isBrandingEnabled(context)) { - applyBrand(readBrandMainColor(context)); - } + applyBrand(isBrandingEnabled(context) + ? readBrandMainColor(context) + : ContextCompat.getColor(context, R.color.defaultBrand)); return binding.getRoot(); } diff --git a/fastlane/metadata/android/en-US/changelogs/1012002.txt b/fastlane/metadata/android/en-US/changelogs/1012002.txt new file mode 100644 index 000000000..bdb51fca4 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/1012002.txt @@ -0,0 +1 @@ +- 🎨️ BottomNavigation in attachment picker is not colored when branding is disabled (#729) \ No newline at end of file -- cgit v1.2.3