Replace setPadding with updatePadding (#14137)

pull/35/head
Tiger Oakes 4 years ago committed by GitHub
parent b01dbeeebf
commit ac2d65cc5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -12,6 +12,7 @@ import android.widget.FrameLayout
import androidx.appcompat.content.res.AppCompatResources import androidx.appcompat.content.res.AppCompatResources
import androidx.appcompat.widget.ContentFrameLayout import androidx.appcompat.widget.ContentFrameLayout
import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.view.updatePadding
import androidx.core.widget.TextViewCompat import androidx.core.widget.TextViewCompat
import com.google.android.material.snackbar.BaseTransientBottomBar import com.google.android.material.snackbar.BaseTransientBottomBar
import com.google.android.material.snackbar.ContentViewCallback import com.google.android.material.snackbar.ContentViewCallback
@ -124,11 +125,8 @@ class FenixSnackbar private constructor(
return FenixSnackbar(parent, content, callback, isError).also { return FenixSnackbar(parent, content, callback, isError).also {
it.duration = durationOrAccessibleDuration it.duration = durationOrAccessibleDuration
it.view.setPadding( it.view.updatePadding(
0, bottom = if (
0,
0,
if (
isDisplayedWithBrowserToolbar && isDisplayedWithBrowserToolbar &&
shouldUseBottomToolbar && shouldUseBottomToolbar &&
// If the view passed in is a ContentFrameLayout, it does not matter // If the view passed in is a ContentFrameLayout, it does not matter

@ -12,6 +12,7 @@ import android.util.AttributeSet
import android.util.TypedValue import android.util.TypedValue
import android.view.LayoutInflater import android.view.LayoutInflater
import android.widget.RelativeLayout import android.widget.RelativeLayout
import androidx.core.view.updatePadding
import kotlinx.android.synthetic.main.mozac_ui_tabcounter_layout.view.* import kotlinx.android.synthetic.main.mozac_ui_tabcounter_layout.view.*
import org.mozilla.fenix.R import org.mozilla.fenix.R
import java.text.NumberFormat import java.text.NumberFormat
@ -178,7 +179,7 @@ class TabCounter @JvmOverloads constructor(
private fun formatForDisplay(count: Int): String { private fun formatForDisplay(count: Int): String {
return if (count > MAX_VISIBLE_TABS) { return if (count > MAX_VISIBLE_TABS) {
counter_text.setPadding(0, 0, 0, INFINITE_CHAR_PADDING_BOTTOM) counter_text.updatePadding(bottom = INFINITE_CHAR_PADDING_BOTTOM)
SO_MANY_TABS_OPEN SO_MANY_TABS_OPEN
} else NumberFormat.getInstance().format(count.toLong()) } else NumberFormat.getInstance().format(count.toLong())
} }

@ -8,6 +8,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.appcompat.content.res.AppCompatResources import androidx.appcompat.content.res.AppCompatResources
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.view.updatePaddingRelative
import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
@ -86,7 +87,7 @@ class SelectBookmarkFolderAdapter(private val sharedViewModel: BookmarksSharedVi
} }
val pxToIndent = dpsToIndent.dpToPx(view.context.resources.displayMetrics) val pxToIndent = dpsToIndent.dpToPx(view.context.resources.displayMetrics)
val padding = pxToIndent * if (folder.depth > maxDepth) maxDepth else folder.depth val padding = pxToIndent * if (folder.depth > maxDepth) maxDepth else folder.depth
view.setPadding(padding, 0, 0, 0) view.updatePaddingRelative(start = padding)
} }
companion object { companion object {

@ -9,6 +9,7 @@ import android.view.ViewGroup
import android.widget.CheckedTextView import android.widget.CheckedTextView
import androidx.annotation.VisibleForTesting import androidx.annotation.VisibleForTesting
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.view.updatePaddingRelative
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import mozilla.components.support.ktx.android.util.dpToPx import mozilla.components.support.ktx.android.util.dpToPx
import org.mozilla.fenix.R import org.mozilla.fenix.R
@ -36,7 +37,7 @@ internal class CollectionsAdapter(
override fun onBindViewHolder(holder: CollectionItemViewHolder, position: Int) { override fun onBindViewHolder(holder: CollectionItemViewHolder, position: Int) {
if (position == 0) { if (position == 0) {
val displayMetrics = holder.textView.context.resources.displayMetrics val displayMetrics = holder.textView.context.resources.displayMetrics
holder.textView.setPadding(NEW_COLLECTION_PADDING_START.dpToPx(displayMetrics), 0, 0, 0) holder.textView.updatePaddingRelative(start = NEW_COLLECTION_PADDING_START.dpToPx(displayMetrics))
holder.textView.compoundDrawablePadding = holder.textView.compoundDrawablePadding =
NEW_COLLECTION_DRAWABLE_PADDING.dpToPx(displayMetrics) NEW_COLLECTION_DRAWABLE_PADDING.dpToPx(displayMetrics)
holder.textView.setCompoundDrawablesWithIntrinsicBounds( holder.textView.setCompoundDrawablesWithIntrinsicBounds(

@ -16,6 +16,7 @@ import androidx.constraintlayout.widget.ConstraintSet
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.core.view.updateLayoutParams import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.ConcatAdapter import androidx.recyclerview.widget.ConcatAdapter
@ -36,7 +37,6 @@ import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
import mozilla.components.browser.state.selector.normalTabs import mozilla.components.browser.state.selector.normalTabs
import mozilla.components.browser.state.selector.privateTabs import mozilla.components.browser.state.selector.privateTabs
import mozilla.components.browser.state.state.BrowserState import mozilla.components.browser.state.state.BrowserState
import mozilla.components.browser.storage.sync.Tab as SyncTab
import mozilla.components.browser.tabstray.TabViewHolder import mozilla.components.browser.tabstray.TabViewHolder
import mozilla.components.feature.syncedtabs.SyncedTabsFeature import mozilla.components.feature.syncedtabs.SyncedTabsFeature
import mozilla.components.support.base.feature.ViewBoundFeatureWrapper import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
@ -51,6 +51,7 @@ import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.tabtray.SaveToCollectionsButtonAdapter.MultiselectModeChange import org.mozilla.fenix.tabtray.SaveToCollectionsButtonAdapter.MultiselectModeChange
import org.mozilla.fenix.tabtray.TabTrayDialogFragmentState.Mode import org.mozilla.fenix.tabtray.TabTrayDialogFragmentState.Mode
import java.text.NumberFormat import java.text.NumberFormat
import mozilla.components.browser.storage.sync.Tab as SyncTab
/** /**
* View that contains and configures the BrowserAwesomeBar * View that contains and configures the BrowserAwesomeBar
@ -493,7 +494,7 @@ class TabTrayView(
private fun updateTabCounter(count: Int): String { private fun updateTabCounter(count: Int): String {
if (count > MAX_VISIBLE_TABS) { if (count > MAX_VISIBLE_TABS) {
counter_text.setPadding(0, 0, 0, INFINITE_CHAR_PADDING_BOTTOM) counter_text.updatePadding(bottom = INFINITE_CHAR_PADDING_BOTTOM)
return SO_MANY_TABS_OPEN return SO_MANY_TABS_OPEN
} }
return NumberFormat.getInstance().format(count.toLong()) return NumberFormat.getInstance().format(count.toLong())

@ -6,6 +6,7 @@ package org.mozilla.fenix.utils
import android.view.View import android.view.View
import androidx.appcompat.widget.ContentFrameLayout import androidx.appcompat.widget.ContentFrameLayout
import androidx.core.view.updatePadding
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
@ -70,11 +71,8 @@ fun CoroutineScope.allowUndo(
val toolbarHeight = view.context.resources val toolbarHeight = view.context.resources
.getDimensionPixelSize(R.dimen.browser_toolbar_height) .getDimensionPixelSize(R.dimen.browser_toolbar_height)
snackbar.view.setPadding( snackbar.view.updatePadding(
0, bottom = if (
0,
0,
if (
paddedForBottomToolbar && paddedForBottomToolbar &&
shouldUseBottomToolbar && shouldUseBottomToolbar &&
// If the view passed in is a ContentFrameLayout, it does not matter // If the view passed in is a ContentFrameLayout, it does not matter

Loading…
Cancel
Save