Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-03 23:15:31 +00:00
Code Issues Releases Wiki Activity

No issue: Update stable androidx and material versions

Browse Source
This commit is contained in:
ekager 2020-11-02 14:13:48 -08:00
parent 8a12d1ac21
commit c0e01373e1
6 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/mozilla/fenix/browser/TabPreview.kt
View File

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

14
app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt
View File

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

14
app/src/main/java/org/mozilla/fenix/library/bookmarks/addfolder/AddBookmarkFolderFragment.kt
View File

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

1
app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt
View File

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

2
app/src/main/res/values/styles.xml
View File

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

12
buildSrc/src/main/java/Dependencies.kt
View File

@ -18,22 +18,22 @@ object Versions {
const val detekt = "1.9.1"
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_coordinator_layout = "1.1.0-rc01"
const val androidx_constraint_layout = "2.0.0"
const val androidx_preference = "1.1.0"
const val androidx_coordinator_layout = "1.1.0"
const val androidx_constraint_layout = "2.0.4"
const val androidx_preference = "1.1.1"
const val androidx_legacy = "1.0.0"
const val androidx_annotation = "1.1.0"
const val androidx_lifecycle = "2.2.0"
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_core = "1.3.2"
const val androidx_paging = "2.1.0"
const val androidx_transition = "1.3.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