No issue: Update stable androidx and material versions

upstream-sync
ekager 4 years ago
parent 8a12d1ac21
commit c0e01373e1

@ -10,7 +10,7 @@ import android.view.Gravity
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.widget.FrameLayout import android.widget.FrameLayout
import androidx.core.content.res.ResourcesCompat import androidx.appcompat.content.res.AppCompatResources
import androidx.core.view.doOnNextLayout import androidx.core.view.doOnNextLayout
import androidx.core.view.updateLayoutParams import androidx.core.view.updateLayoutParams
import kotlinx.android.synthetic.main.mozac_ui_tabcounter_layout.view.* import kotlinx.android.synthetic.main.mozac_ui_tabcounter_layout.view.*
@ -40,10 +40,9 @@ class TabPreview @JvmOverloads constructor(
gravity = Gravity.TOP gravity = Gravity.TOP
} }
fakeToolbar.background = ResourcesCompat.getDrawable( fakeToolbar.background = AppCompatResources.getDrawable(
resources, context,
ThemeManager.resolveAttribute(R.attr.bottomBarBackgroundTop, context), ThemeManager.resolveAttribute(R.attr.bottomBarBackgroundTop, context)
null
) )
} }
@ -64,7 +63,10 @@ class TabPreview @JvmOverloads constructor(
fun loadPreviewThumbnail(thumbnailId: String) { fun loadPreviewThumbnail(thumbnailId: String) {
doOnNextLayout { doOnNextLayout {
val thumbnailSize = max(previewThumbnail.height, previewThumbnail.width) val thumbnailSize = max(previewThumbnail.height, previewThumbnail.width)
thumbnailLoader.loadIntoView(previewThumbnail, ImageLoadRequest(thumbnailId, thumbnailSize)) thumbnailLoader.loadIntoView(
previewThumbnail,
ImageLoadRequest(thumbnailId, thumbnailSize)
)
} }
} }
} }

@ -4,6 +4,7 @@
package org.mozilla.fenix.components package org.mozilla.fenix.components
import android.graphics.Color
import android.util.TypedValue import android.util.TypedValue
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
@ -32,7 +33,7 @@ class FenixSnackbar private constructor(
) : BaseTransientBottomBar<FenixSnackbar>(parent, content, contentViewCallback) { ) : BaseTransientBottomBar<FenixSnackbar>(parent, content, contentViewCallback) {
init { init {
view.background = null view.setBackgroundColor(Color.TRANSPARENT)
setAppropriateBackground(isError) setAppropriateBackground(isError)
@ -111,11 +112,12 @@ class FenixSnackbar private constructor(
val inflater = LayoutInflater.from(parent.context) val inflater = LayoutInflater.from(parent.context)
val content = inflater.inflate(R.layout.fenix_snackbar, parent, false) val content = inflater.inflate(R.layout.fenix_snackbar, parent, false)
val durationOrAccessibleDuration = if (parent.context.settings().accessibilityServicesEnabled) { val durationOrAccessibleDuration =
LENGTH_ACCESSIBLE if (parent.context.settings().accessibilityServicesEnabled) {
} else { LENGTH_ACCESSIBLE
duration } else {
} duration
}
val callback = FenixSnackbarCallback(content) val callback = FenixSnackbarCallback(content)
val shouldUseBottomToolbar = view.context.settings().shouldUseBottomToolbar val shouldUseBottomToolbar = view.context.settings().shouldUseBottomToolbar

@ -48,6 +48,7 @@ class AddBookmarkFolderFragment : Fragment(R.layout.fragment_edit_bookmark) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
bookmarkUrlLabel.visibility = GONE bookmarkUrlLabel.visibility = GONE
bookmarkUrlEdit.visibility = GONE bookmarkUrlEdit.visibility = GONE
inputLayoutBookmarkUrl.visibility = GONE
bookmarkNameEdit.showKeyboard() bookmarkNameEdit.showKeyboard()
} }
@ -62,7 +63,8 @@ class AddBookmarkFolderFragment : Fragment(R.layout.fragment_edit_bookmark) {
?: requireComponents.core.bookmarksStorage.getBookmark(BookmarkRoot.Mobile.id) ?: requireComponents.core.bookmarksStorage.getBookmark(BookmarkRoot.Mobile.id)
} }
bookmarkParentFolderSelector.text = friendlyRootTitle(context, sharedViewModel.selectedFolder!!) bookmarkParentFolderSelector.text =
friendlyRootTitle(context, sharedViewModel.selectedFolder!!)
bookmarkParentFolderSelector.setOnClickListener { bookmarkParentFolderSelector.setOnClickListener {
nav( nav(
R.id.bookmarkAddFolderFragment, R.id.bookmarkAddFolderFragment,
@ -95,12 +97,16 @@ class AddBookmarkFolderFragment : Fragment(R.layout.fragment_edit_bookmark) {
this.view?.hideKeyboard() this.view?.hideKeyboard()
viewLifecycleOwner.lifecycleScope.launch(IO) { viewLifecycleOwner.lifecycleScope.launch(IO) {
val newGuid = requireComponents.core.bookmarksStorage.addFolder( val newGuid = requireComponents.core.bookmarksStorage.addFolder(
sharedViewModel.selectedFolder!!.guid, bookmarkNameEdit.text.toString(), null sharedViewModel.selectedFolder!!.guid,
bookmarkNameEdit.text.toString(),
null
) )
sharedViewModel.selectedFolder = requireComponents.core.bookmarksStorage.getTree(newGuid) sharedViewModel.selectedFolder =
requireComponents.core.bookmarksStorage.getTree(newGuid)
requireComponents.analytics.metrics.track(Event.AddBookmarkFolder) requireComponents.analytics.metrics.track(Event.AddBookmarkFolder)
withContext(Main) { withContext(Main) {
Navigation.findNavController(requireActivity(), R.id.container).popBackStack() Navigation.findNavController(requireActivity(), R.id.container)
.popBackStack()
} }
} }
true true

@ -95,6 +95,7 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
when (bookmarkNode?.type) { when (bookmarkNode?.type) {
BookmarkNodeType.FOLDER -> { BookmarkNodeType.FOLDER -> {
activity?.title = getString(R.string.edit_bookmark_folder_fragment_title) activity?.title = getString(R.string.edit_bookmark_folder_fragment_title)
inputLayoutBookmarkUrl.visibility = View.GONE
bookmarkUrlEdit.visibility = View.GONE bookmarkUrlEdit.visibility = View.GONE
bookmarkUrlLabel.visibility = View.GONE bookmarkUrlLabel.visibility = View.GONE
} }

@ -622,7 +622,7 @@
<style name="BottomSheetModal" parent="Widget.Design.BottomSheet.Modal"> <style name="BottomSheetModal" parent="Widget.Design.BottomSheet.Modal">
<item name="shapeAppearance">@style/BottomSheetShapeAppearance</item> <item name="shapeAppearance">@style/BottomSheetShapeAppearance</item>
<item name="behavior_fitToContents">false</item> <item name="behavior_fitToContents">false</item>
<item name="behavior_expandedOffset">80</item> <item name="behavior_expandedOffset">80dp</item>
<item name="behavior_skipCollapsed">false</item> <item name="behavior_skipCollapsed">false</item>
<!-- Effectively disable STATE_HALF_EXPANDED by having the tray have a minuscule height in this state --> <!-- Effectively disable STATE_HALF_EXPANDED by having the tray have a minuscule height in this state -->
<item name="behavior_halfExpandedRatio">0.001</item> <item name="behavior_halfExpandedRatio">0.001</item>

@ -18,22 +18,22 @@ object Versions {
const val detekt = "1.9.1" const val detekt = "1.9.1"
const val jna = "5.6.0" const val jna = "5.6.0"
const val androidx_appcompat = "1.2.0-rc01" const val androidx_appcompat = "1.2.0"
const val androidx_biometric = "1.1.0-beta01" const val androidx_biometric = "1.1.0-beta01"
const val androidx_coordinator_layout = "1.1.0-rc01" const val androidx_coordinator_layout = "1.1.0"
const val androidx_constraint_layout = "2.0.0" const val androidx_constraint_layout = "2.0.4"
const val androidx_preference = "1.1.0" const val androidx_preference = "1.1.1"
const val androidx_legacy = "1.0.0" const val androidx_legacy = "1.0.0"
const val androidx_annotation = "1.1.0" const val androidx_annotation = "1.1.0"
const val androidx_lifecycle = "2.2.0" const val androidx_lifecycle = "2.2.0"
const val androidx_fragment = "1.2.5" const val androidx_fragment = "1.2.5"
const val androidx_navigation = "2.3.0" const val androidx_navigation = "2.3.1"
const val androidx_recyclerview = "1.2.0-alpha06" const val androidx_recyclerview = "1.2.0-alpha06"
const val androidx_core = "1.3.2" const val androidx_core = "1.3.2"
const val androidx_paging = "2.1.0" const val androidx_paging = "2.1.0"
const val androidx_transition = "1.3.0" const val androidx_transition = "1.3.0"
const val androidx_work = "2.2.0" const val androidx_work = "2.2.0"
const val google_material = "1.1.0" const val google_material = "1.2.1"
const val mozilla_android_components = AndroidComponents.VERSION const val mozilla_android_components = AndroidComponents.VERSION

Loading…
Cancel
Save