/*
- * Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2016-2024 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
*
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
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()
}
}
+ // 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()
val defaultFavoriteIcon = defaultFavoriteIconBitmapDrawable.bitmap
// Create a history array list.
- val historyArrayList = ArrayList<History>()
+ val historyDataClassArrayList = ArrayList<HistoryDataClass>()
// 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) {
}
// 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.
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)
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<ListView>(R.id.history_listview)!!
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<TextView>(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()
// Return the alert dialog.
return alertDialog
}
-}
\ No newline at end of file
+}