X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fadapters%2FPinnedMismatchPagerAdapter.kt;h=51eddb67b6571bd8257d521d60fbdcf3a859769a;hp=f955fb8483afc86f61f0d256c23e1d4150913074;hb=ab11ca2de00c56982e46627c8e7fc670462b0b3c;hpb=6ea3e4ebd779594b45ad8f51cc40761bb6d89030 diff --git a/app/src/main/java/com/stoutner/privacybrowser/adapters/PinnedMismatchPagerAdapter.kt b/app/src/main/java/com/stoutner/privacybrowser/adapters/PinnedMismatchPagerAdapter.kt index f955fb84..51eddb67 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/adapters/PinnedMismatchPagerAdapter.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/adapters/PinnedMismatchPagerAdapter.kt @@ -207,22 +207,18 @@ class PinnedMismatchPagerAdapter(private val context: Context, private val layou // Set the color spans according to the theme. The deprecated `resources` must be used until the minimum API >= 23. if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { - @Suppress("DEPRECATION") - blueColorSpan = ForegroundColorSpan(context.resources.getColor(R.color.blue_700)) - @Suppress("DEPRECATION") - redColorSpan = ForegroundColorSpan(context.resources.getColor(R.color.red_a700)) + blueColorSpan = ForegroundColorSpan(context.getColor(R.color.blue_700)) + redColorSpan = ForegroundColorSpan(context.getColor(R.color.red_a700)) } else { - @Suppress("DEPRECATION") - blueColorSpan = ForegroundColorSpan(context.resources.getColor(R.color.violet_700)) - @Suppress("DEPRECATION") - redColorSpan = ForegroundColorSpan(context.resources.getColor(R.color.red_900)) + blueColorSpan = ForegroundColorSpan(context.getColor(R.color.violet_700)) + redColorSpan = ForegroundColorSpan(context.getColor(R.color.red_900)) } // Set the domain name to be blue. domainNameStringBuilder.setSpan(blueColorSpan, domainNameLabel.length, domainNameStringBuilder.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE) // Color coordinate the IP addresses if they are pinned. - if (!nestedScrollWebView.pinnedIpAddresses.equals("")) { + if (nestedScrollWebView.pinnedIpAddresses != "") { if (nestedScrollWebView.currentIpAddresses == nestedScrollWebView.pinnedIpAddresses) { ipAddressesStringBuilder.setSpan(blueColorSpan, ipAddressesLabel.length, ipAddressesStringBuilder.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE) } else {