From 562eb89356e291f1037cde6f87cbfe108488f58e Mon Sep 17 00:00:00 2001 From: Rushab Kumar Date: Wed, 18 Dec 2019 22:34:02 +0530 Subject: [PATCH] For #7250 - Replace anko.dimen --- .../main/java/org/mozilla/fenix/browser/BrowserFragment.kt | 3 +-- .../mozilla/fenix/components/toolbar/BrowserToolbarView.kt | 7 +++---- app/src/main/java/org/mozilla/fenix/ext/Context.kt | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index d54782765..e61333177 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -28,7 +28,6 @@ import mozilla.components.feature.tabs.WindowFeature import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.support.base.feature.UserInteractionHandler import mozilla.components.support.base.feature.ViewBoundFeatureWrapper -import org.jetbrains.anko.dimen import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.components.FenixSnackbar @@ -129,7 +128,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler { val browserEngine = swipeRefresh.layoutParams as CoordinatorLayout.LayoutParams browserEngine.bottomMargin = if (requireContext().settings().shouldUseBottomToolbar) { - requireContext().dimen(R.dimen.browser_toolbar_height) + requireContext().resources.getDimensionPixelSize(R.dimen.browser_toolbar_height) } else { 0 } diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt index 5e65d24d9..de98ce5a4 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt @@ -23,7 +23,6 @@ import mozilla.components.browser.session.Session import mozilla.components.browser.toolbar.BrowserToolbar import mozilla.components.browser.toolbar.display.DisplayToolbar import mozilla.components.support.ktx.android.util.dpToFloat -import org.jetbrains.anko.dimen import org.mozilla.fenix.R import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.customtabs.CustomTabToolbarIntegration @@ -78,14 +77,14 @@ class BrowserToolbarView( val popupWindow = PopupWindow( customView, LinearLayout.LayoutParams.WRAP_CONTENT, - view.context.dimen(R.dimen.context_menu_height), + view.context.resources.getDimensionPixelSize(R.dimen.context_menu_height), true ) val selectedSession = container.context.components.core.sessionManager.selectedSession popupWindow.elevation = - view.context.dimen(R.dimen.mozac_browser_menu_elevation).toFloat() + view.context.resources.getDimension(R.dimen.mozac_browser_menu_elevation) customView.paste.isVisible = !clipboard.text.isNullOrEmpty() && !isCustomTabSession customView.paste_and_go.isVisible = @@ -117,7 +116,7 @@ class BrowserToolbarView( popupWindow.showAsDropDown( view, - view.context.dimen(R.dimen.context_menu_x_offset), + view.context.resources.getDimensionPixelSize(R.dimen.context_menu_x_offset), 0, Gravity.START ) diff --git a/app/src/main/java/org/mozilla/fenix/ext/Context.kt b/app/src/main/java/org/mozilla/fenix/ext/Context.kt index d1f72a1af..4d605269f 100644 --- a/app/src/main/java/org/mozilla/fenix/ext/Context.kt +++ b/app/src/main/java/org/mozilla/fenix/ext/Context.kt @@ -24,7 +24,6 @@ import mozilla.components.browser.search.SearchEngineManager import mozilla.components.support.base.log.Log import mozilla.components.support.base.log.Log.Priority.WARN import mozilla.components.support.ktx.android.content.getColorFromAttr -import org.jetbrains.anko.dimen import org.jetbrains.anko.px2dip import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.Config @@ -114,4 +113,4 @@ fun Context.settings(isCrashReportEnabledInBuild: Boolean = BuildConfig.CRASH_RE Settings.getInstance(this, isCrashReportEnabledInBuild) fun Context.getDimenInDip(@DimenRes resource: Int) = - this.px2dip(this.dimen(resource)) + this.px2dip(this.resources.getDimensionPixelSize(resource))