2
0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00
Nikit Bhandari 2019-08-01 00:13:49 +05:30 committed by Jeff Boek
parent 853ad4d175
commit 49eb339d15
4 changed files with 3 additions and 7 deletions

View File

@ -43,7 +43,6 @@ class CollectionCreationUIView(
actionEmitter, actionEmitter,
changesObservable changesObservable
) { ) {
override val view = LayoutInflater.from(container.context) override val view = LayoutInflater.from(container.context)
.inflate(R.layout.component_collection_creation, container, true) .inflate(R.layout.component_collection_creation, container, true)

View File

@ -14,7 +14,7 @@ import mozilla.components.browser.domains.autocomplete.ShippedDomainsProvider
import mozilla.components.browser.toolbar.BrowserToolbar import mozilla.components.browser.toolbar.BrowserToolbar
import mozilla.components.concept.storage.HistoryStorage import mozilla.components.concept.storage.HistoryStorage
import mozilla.components.feature.toolbar.ToolbarAutocompleteFeature import mozilla.components.feature.toolbar.ToolbarAutocompleteFeature
import mozilla.components.support.ktx.android.content.res.pxToDp import mozilla.components.support.ktx.android.util.dpToPx
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.ext.getColorFromAttr import org.mozilla.fenix.ext.getColorFromAttr
import org.mozilla.fenix.search.SearchState import org.mozilla.fenix.search.SearchState
@ -66,7 +66,7 @@ class ToolbarView(
view.apply { view.apply {
editMode() editMode()
elevation = resources.pxToDp(TOOLBAR_ELEVATION_IN_DP).toFloat() elevation = TOOLBAR_ELEVATION_IN_DP.dpToPx(resources.displayMetrics).toFloat()
setOnUrlCommitListener { setOnUrlCommitListener {
interactor.onUrlCommitted(it) interactor.onUrlCommitted(it)

View File

@ -66,7 +66,6 @@ class TurnOnSyncFragment : Fragment(), AccountObserver {
// We could auto-close this tab once we get to the end of the authentication process? // We could auto-close this tab once we get to the end of the authentication process?
// Via an interceptor, perhaps. // Via an interceptor, perhaps.
requireComponents.analytics.metrics.track(Event.SyncAuthSignIn) requireComponents.analytics.metrics.track(Event.SyncAuthSignIn)
true
} }
} }
@ -75,8 +74,6 @@ class TurnOnSyncFragment : Fragment(), AccountObserver {
val directions = TurnOnSyncFragmentDirections.actionTurnOnSyncFragmentToPairFragment() val directions = TurnOnSyncFragmentDirections.actionTurnOnSyncFragmentToPairFragment()
Navigation.findNavController(view!!).navigate(directions) Navigation.findNavController(view!!).navigate(directions)
requireComponents.analytics.metrics.track(Event.SyncAuthScanPairing) requireComponents.analytics.metrics.track(Event.SyncAuthScanPairing)
true
} }
} }

View File

@ -245,7 +245,7 @@ class QuickSettingsSheetDialogFragment : AppCompatDialogFragment() {
private val sessionObserver = object : Session.Observer { private val sessionObserver = object : Session.Observer {
override fun onUrlChanged(session: Session, url: String) { override fun onUrlChanged(session: Session, url: String) {
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
val host = session.url.toUri()?.host val host = session.url.toUri().host
val sitePermissions: SitePermissions? = host?.let { val sitePermissions: SitePermissions? = host?.let {
val storage = requireContext().components.core.permissionStorage val storage = requireContext().components.core.permissionStorage
storage.findSitePermissionsBy(it) storage.findSitePermissionsBy(it)