From 5c723398e06f65dbe31ad1b07af73da0d1cf6222 Mon Sep 17 00:00:00 2001 From: FourTOne5 <59261191+FourTOne5@users.noreply.github.com> Date: Mon, 16 May 2022 22:04:54 +0600 Subject: [PATCH] Fix both warning banner appearing for unofficial ext (#7150) (cherry picked from commit cbc114608b76a083b4db8f66abde456a32b61638) --- .../browse/ExtensionDetailsScreen.kt | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt index d498e1d56..aee1b5a8d 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt @@ -68,26 +68,23 @@ fun ExtensionDetailsScreen( modifier = Modifier.nestedScroll(nestedScrollInterop), contentPadding = WindowInsets.navigationBars.asPaddingValues(), ) { - if (extension.isObsolete) { - item { - WarningBanner(R.string.obsolete_extension_message) - } + when { + // SY --> + extension.isRedundant -> + item { + WarningBanner(R.string.redundant_extension_message) + } + // SY <-- + extension.isUnofficial -> + item { + WarningBanner(R.string.unofficial_extension_message) + } + extension.isObsolete -> + item { + WarningBanner(R.string.obsolete_extension_message) + } } - if (extension.isUnofficial) { - item { - WarningBanner(R.string.unofficial_extension_message) - } - } - - // SY --> - if (extension.isRedundant) { - item { - WarningBanner(R.string.redundant_extension_message) - } - } - // SY <-- - item { DetailsHeader(extension, onClickUninstall, onClickAppInfo) }