mirror of
https://github.com/fork-maintainers/iceraven-browser
synced 2024-11-19 09:25:34 +00:00
[fenix] No issue: Update androidx dependencies 02.08.20
This commit is contained in:
parent
f9338cf5c7
commit
b9d9c21972
@ -86,6 +86,7 @@ import org.mozilla.fenix.ext.sessionsOfType
|
|||||||
import org.mozilla.fenix.ext.settings
|
import org.mozilla.fenix.ext.settings
|
||||||
import org.mozilla.fenix.settings.SupportUtils
|
import org.mozilla.fenix.settings.SupportUtils
|
||||||
import org.mozilla.fenix.theme.ThemeManager
|
import org.mozilla.fenix.theme.ThemeManager
|
||||||
|
import org.mozilla.fenix.utils.FragmentPreDrawManager
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Base fragment extended by [BrowserFragment].
|
* Base fragment extended by [BrowserFragment].
|
||||||
@ -141,6 +142,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
|
|||||||
}
|
}
|
||||||
|
|
||||||
final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
|
FragmentPreDrawManager(this).execute {}
|
||||||
browserInitialized = initializeUI(view) != null
|
browserInitialized = initializeUI(view) != null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,9 +62,6 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
|
|||||||
): View {
|
): View {
|
||||||
val view = super.onCreateView(inflater, container, savedInstanceState)
|
val view = super.onCreateView(inflater, container, savedInstanceState)
|
||||||
view.browserLayout.transitionName = "$TAB_ITEM_TRANSITION_NAME${getSessionById()?.id}"
|
view.browserLayout.transitionName = "$TAB_ITEM_TRANSITION_NAME${getSessionById()?.id}"
|
||||||
|
|
||||||
startPostponedEnterTransition()
|
|
||||||
|
|
||||||
return view
|
return view
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,8 +2,7 @@
|
|||||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||||
<androidx.cardview.widget.CardView
|
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:id="@+id/item_tab"
|
android:id="@+id/item_tab"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@ -19,8 +18,9 @@
|
|||||||
app:cardElevation="5dp">
|
app:cardElevation="5dp">
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:id="@+id/inner_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/favicon_image"
|
android:id="@+id/favicon_image"
|
||||||
@ -30,25 +30,25 @@
|
|||||||
android:adjustViewBounds="true"
|
android:adjustViewBounds="true"
|
||||||
android:importantForAccessibility="no"
|
android:importantForAccessibility="no"
|
||||||
android:scaleType="fitCenter"
|
android:scaleType="fitCenter"
|
||||||
app:layout_constraintDimensionRatio="1:1"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintDimensionRatio="1:1"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/play_pause_button"
|
android:id="@+id/play_pause_button"
|
||||||
android:contentDescription="@string/mozac_feature_media_notification_action_pause"
|
|
||||||
android:layout_width="24dp"
|
android:layout_width="24dp"
|
||||||
android:layout_height="24dp"
|
android:layout_height="24dp"
|
||||||
android:elevation="10dp"
|
|
||||||
android:background="?attr/selectableItemBackgroundBorderless"
|
android:background="?attr/selectableItemBackgroundBorderless"
|
||||||
app:srcCompat="@drawable/pause_with_background"
|
android:contentDescription="@string/mozac_feature_media_notification_action_pause"
|
||||||
|
android:elevation="10dp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
app:layout_constraintCircle="@id/favicon_image"
|
||||||
app:layout_constraintCircleAngle="45"
|
app:layout_constraintCircleAngle="45"
|
||||||
app:layout_constraintCircleRadius="28dp"
|
app:layout_constraintCircleRadius="28dp"
|
||||||
app:layout_constraintCircle="@id/favicon_image"
|
|
||||||
app:layout_constraintEnd_toEndOf="@id/favicon_image"
|
app:layout_constraintEnd_toEndOf="@id/favicon_image"
|
||||||
app:layout_constraintTop_toTopOf="@id/favicon_image" />
|
app:layout_constraintTop_toTopOf="@id/favicon_image"
|
||||||
|
app:srcCompat="@drawable/pause_with_background" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/hostname"
|
android:id="@+id/hostname"
|
||||||
@ -73,20 +73,20 @@
|
|||||||
android:minLines="2"
|
android:minLines="2"
|
||||||
android:textColor="?primaryText"
|
android:textColor="?primaryText"
|
||||||
android:textSize="14sp"
|
android:textSize="14sp"
|
||||||
app:layout_constraintStart_toEndOf="@id/favicon_image"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="@id/hostname"
|
app:layout_constraintEnd_toEndOf="@id/hostname"
|
||||||
app:layout_constraintTop_toBottomOf="@id/hostname"
|
app:layout_constraintStart_toEndOf="@id/favicon_image"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
app:layout_constraintTop_toBottomOf="@id/hostname" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/close_tab_button"
|
android:id="@+id/close_tab_button"
|
||||||
android:layout_width="48dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="48dp"
|
||||||
android:alpha="0.8"
|
android:alpha="0.8"
|
||||||
app:srcCompat="@drawable/ic_close"
|
|
||||||
android:background="?android:attr/selectableItemBackgroundBorderless"
|
android:background="?android:attr/selectableItemBackgroundBorderless"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent"/>
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:srcCompat="@drawable/ic_close" />
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:id="@+id/selected_border"
|
android:id="@+id/selected_border"
|
||||||
|
@ -15,22 +15,22 @@ object Versions {
|
|||||||
|
|
||||||
const val androidx_appcompat = "1.1.0"
|
const val androidx_appcompat = "1.1.0"
|
||||||
const val androidx_biometric = "1.0.1"
|
const val androidx_biometric = "1.0.1"
|
||||||
const val androidx_coordinator_layout = "1.1.0-beta01"
|
const val androidx_coordinator_layout = "1.1.0-rc01"
|
||||||
const val androidx_constraint_layout = "2.0.0-beta2"
|
const val androidx_constraint_layout = "2.0.0-beta4"
|
||||||
const val androidx_preference = "1.1.0"
|
const val androidx_preference = "1.1.0"
|
||||||
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-rc02"
|
const val androidx_lifecycle = "2.2.0"
|
||||||
const val androidx_fragment = "1.2.0-beta02"
|
const val androidx_fragment = "1.2.1"
|
||||||
const val androidx_navigation = "2.2.0-beta01"
|
const val androidx_navigation = "2.2.1"
|
||||||
const val androidx_recyclerview = "1.1.0-beta04"
|
const val androidx_recyclerview = "1.1.0"
|
||||||
const val androidx_testing = "1.2.1-alpha02"
|
const val androidx_testing = "1.2.1-alpha02"
|
||||||
const val androidx_test_ext = "1.0.0"
|
const val androidx_test_ext = "1.0.0"
|
||||||
const val androidx_core = "1.2.0-beta01"
|
const val androidx_core = "1.2.0"
|
||||||
const val androidx_paging = "2.1.0"
|
const val androidx_paging = "2.1.0"
|
||||||
const val androidx_transition = "1.3.0-beta01"
|
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-beta01"
|
const val google_material = "1.1.0"
|
||||||
|
|
||||||
const val mozilla_android_components = "31.0.0-SNAPSHOT"
|
const val mozilla_android_components = "31.0.0-SNAPSHOT"
|
||||||
// Note that android-components also depends on application-services,
|
// Note that android-components also depends on application-services,
|
||||||
|
Loading…
Reference in New Issue
Block a user