/*
- * Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2016-2023 Soren Stoutner <soren@stoutner.com>.
*
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
*
- * Privacy Browser is free software: you can redistribute it and/or modify
+ * Privacy Browser Android is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * Privacy Browser is distributed in the hope that it will be useful,
+ * Privacy Browser Android is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Privacy Browser. If not, see <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android. If not, see <http://www.gnu.org/licenses/>.
*/
package com.stoutner.privacybrowser.dialogs
-import android.annotation.SuppressLint
import android.app.Dialog
import android.content.Context
import android.content.DialogInterface
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"
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()
}
}
- // `@SuppressLint("InflateParams")` removes the warning about using null as the parent view group when inflating the alert dialog.
- @SuppressLint("InflateParams")
+ // 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
+ }
+
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.
// Set the title.
dialogBuilder.setTitle(R.string.history)
- // Set the view. The parent view is `null` because it will be assigned by the alert dialog.
- dialogBuilder.setView(layoutInflater.inflate(R.layout.url_history_dialog, null))
+ // Set the view.
+ dialogBuilder.setView(R.layout.url_history_dialog)
// Setup the clear history button listener.
dialogBuilder.setNegativeButton(R.string.clear_history) { _: DialogInterface, _: Int ->
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)!!
// Return the alert dialog.
return alertDialog
}
-}
\ No newline at end of file
+}
projects / PrivacyBrowserAndroid.git / blobdiff