X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fviews%2FNestedScrollWebView.kt;fp=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fviews%2FNestedScrollWebView.kt;h=45133be52c016316c0cfb8bfae9d21775f2d4c26;hp=fa32cf0c1e6f0b03c1b32393d7afdf44b4e0f1a7;hb=60e583d7aa5272bc0293797af77e6167f18887b3;hpb=e065315a36c804626a7dba38d3edad05e9fdb473 diff --git a/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.kt b/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.kt index fa32cf0c..45133be5 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 Soren Stoutner . + * Copyright 2019-2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -23,7 +23,6 @@ import android.animation.ObjectAnimator import android.annotation.SuppressLint import android.content.Context import android.graphics.Bitmap -import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable import android.os.Bundle import android.util.AttributeSet @@ -32,12 +31,10 @@ import android.webkit.HttpAuthHandler import android.webkit.SslErrorHandler import android.webkit.WebView -import androidx.appcompat.content.res.AppCompatResources.getDrawable import androidx.core.view.NestedScrollingChild2 import androidx.core.view.NestedScrollingChildHelper import androidx.core.view.ViewCompat -import com.stoutner.privacybrowser.R import com.stoutner.privacybrowser.activities.MainWebViewActivity import java.util.Collections @@ -143,19 +140,13 @@ class NestedScrollWebView @JvmOverloads constructor(context: Context, attributeS nestedScrollingChildHelper.isNestedScrollingEnabled = true // Initialize the favorite icon. - initializeFavoriteIcon() + resetFavoriteIcon() } // Favorite or default icon. - fun initializeFavoriteIcon() { - // Get the default favorite icon drawable. - val favoriteIconDrawable = getDrawable(context, R.drawable.world) - - // Cast the favorite icon drawable to a bitmap drawable. - val favoriteIconBitmapDrawable = (favoriteIconDrawable as BitmapDrawable?)!! - + fun resetFavoriteIcon() { // Store the default icon bitmap. - favoriteIcon = favoriteIconBitmapDrawable.bitmap + favoriteIcon = MainWebViewActivity.defaultFavoriteIconBitmap // Set the favorite icon height to be 0. This way any favorite icons presented by the website will overwrite it. favoriteIconHeight = 0