X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FUrlHistoryDialog.kt;h=eedd644778532636c9116bf8fda08befd32c68d0;hb=60e583d7aa5272bc0293797af77e6167f18887b3;hp=4061ef733143eabfd8701b5dad056a7374e68a8a;hpb=8142ac5fc2489de735de4b6fa21a1eae733ccfce;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/UrlHistoryDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/UrlHistoryDialog.kt index 4061ef73..eedd6447 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/UrlHistoryDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/UrlHistoryDialog.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2022 Soren Stoutner . + * Copyright 2016-2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -29,7 +29,6 @@ import android.view.WindowManager import android.widget.AdapterView import android.widget.AdapterView.OnItemClickListener import android.widget.ListView -import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.core.content.ContextCompat @@ -39,32 +38,14 @@ import androidx.preference.PreferenceManager import com.stoutner.privacybrowser.R import com.stoutner.privacybrowser.activities.MainWebViewActivity import com.stoutner.privacybrowser.adapters.HistoryArrayAdapter -import com.stoutner.privacybrowser.dataclasses.History +import com.stoutner.privacybrowser.dataclasses.HistoryDataClass import com.stoutner.privacybrowser.views.NestedScrollWebView // Define the class constants. -private const val WEBVIEW_FRAGMENT_ID = "webview_fragment_id" +private const val WEBVIEW_FRAGMENT_ID = "A" class UrlHistoryDialog : DialogFragment() { - // Declare the class variables. - private lateinit var navigateHistoryListener: NavigateHistoryListener - - // The public interface is used to send information back to the parent activity. - interface NavigateHistoryListener { - fun navigateHistory(url: String, steps: Int) - } - - override fun onAttach(context: Context) { - // Run the default commands. - super.onAttach(context) - - // Get a handle for the listener from the launching context. - navigateHistoryListener = context as NavigateHistoryListener - } - companion object { - // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin. - @JvmStatic fun loadBackForwardList(webViewFragmentId: Long): UrlHistoryDialog { // Create an arguments bundle. val argumentsBundle = Bundle() @@ -83,15 +64,31 @@ class UrlHistoryDialog : DialogFragment() { } } + // Declare the class variables. + private lateinit var navigateHistoryListener: NavigateHistoryListener + + // The public interface is used to send information back to the parent activity. + interface NavigateHistoryListener { + fun navigateHistory(steps: Int) + } + + override fun onAttach(context: Context) { + // Run the default commands. + super.onAttach(context) + + // Get a handle for the listener from the launching context. + navigateHistoryListener = context as NavigateHistoryListener + } + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the WebView fragment ID from the arguments. val webViewFragmentId = requireArguments().getLong(WEBVIEW_FRAGMENT_ID) // Get the current position of this WebView fragment. - val webViewPosition = MainWebViewActivity.webViewPagerAdapter.getPositionForId(webViewFragmentId) + val webViewPosition = MainWebViewActivity.webViewStateAdapter!!.getPositionForId(webViewFragmentId) // Get the WebView tab fragment. - val webViewTabFragment = MainWebViewActivity.webViewPagerAdapter.getPageFragment(webViewPosition) + val webViewTabFragment = MainWebViewActivity.webViewStateAdapter!!.getPageFragment(webViewPosition) // Get the fragment view. val fragmentView = webViewTabFragment.requireView() @@ -115,7 +112,7 @@ class UrlHistoryDialog : DialogFragment() { val defaultFavoriteIcon = defaultFavoriteIconBitmapDrawable.bitmap // Create a history array list. - val historyArrayList = ArrayList() + val historyDataClassArrayList = ArrayList() // Populate the history array list, descending from the end of the list so that the newest entries are at the top. `-1` is needed because the history array list is zero-based. for (i in webBackForwardList.size - 1 downTo 0) { @@ -128,10 +125,10 @@ class UrlHistoryDialog : DialogFragment() { } // Store the favorite icon and the URL in history entry. - val historyEntry = History(favoriteIconBitmap!!, webBackForwardList.getItemAtIndex(i).url) + val historyDataClassEntry = HistoryDataClass(favoriteIconBitmap!!, webBackForwardList.getItemAtIndex(i).url) // Add this history entry to the history array list. - historyArrayList.add(historyEntry) + historyDataClassArrayList.add(historyDataClassEntry) } // Subtract the original current page ID from the array size because the order of the array is reversed so that the newest entries are at the top. `-1` is needed because the array is zero-based. @@ -159,7 +156,7 @@ class UrlHistoryDialog : DialogFragment() { val alertDialog = dialogBuilder.create() // Get a handle for the shared preferences. - val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) + val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) // Get the screenshot preference. val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false) @@ -174,7 +171,7 @@ class UrlHistoryDialog : DialogFragment() { alertDialog.show() // Instantiate a history array adapter. - val historyArrayAdapter = HistoryArrayAdapter(context, historyArrayList, currentPageId) + val historyArrayAdapter = HistoryArrayAdapter(requireContext(), historyDataClassArrayList, currentPageId) // Get a handle for the list view. val listView = alertDialog.findViewById(R.id.history_listview)!! @@ -183,20 +180,14 @@ class UrlHistoryDialog : DialogFragment() { listView.adapter = historyArrayAdapter // Listen for clicks on entries in the list view. - listView.onItemClickListener = OnItemClickListener { _: AdapterView<*>?, view: View, _: Int, id: Long -> + listView.onItemClickListener = OnItemClickListener { _: AdapterView<*>?, _: View, _: Int, id: Long -> // Convert the long ID to an int. val itemId = id.toInt() // Only consume the click if it is not on the current page ID. if (itemId != currentPageId) { - // Get a handle for the URL text view. - val urlTextView = view.findViewById(R.id.history_url_textview) - - // Get the URL. - val url = urlTextView.text.toString() - - // Invoke the navigate history listener in the calling activity. These commands cannot be run here because they need access to `applyDomainSettings()`. - navigateHistoryListener.navigateHistory(url, currentPageId - itemId) + // Invoke the navigate history listener in the calling activity. Those commands cannot be run here because they need access to `applyDomainSettings()`. + navigateHistoryListener.navigateHistory(currentPageId - itemId) // Dismiss the alert dialog. alertDialog.dismiss() @@ -206,4 +197,4 @@ class UrlHistoryDialog : DialogFragment() { // Return the alert dialog. return alertDialog } -} \ No newline at end of file +}