blallo
/
fenix
1
0
Fork 0
Code Releases Activity

No issue: Remove black flash workaround

master
ekager 2019-10-14 11:51:01 -07:00
parent 8e4d7248ac
commit 663126f696
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
View File

@ -6,6 +6,8 @@ package org.mozilla.fenix.browser
import android.content.Intent import android.content.Intent
import android.content.pm.ActivityInfo import android.content.pm.ActivityInfo
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
@ -13,13 +15,11 @@ import android.view.ViewGroup
import androidx.annotation.CallSuper import androidx.annotation.CallSuper
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.graphics.drawable.toDrawable
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.whenStarted
import androidx.navigation.NavDirections import androidx.navigation.NavDirections
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
@ -402,15 +402,9 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
private fun adjustBackgroundAndNavigate(directions: NavDirections) { private fun adjustBackgroundAndNavigate(directions: NavDirections) {
context?.let { context?.let {
engineView.captureThumbnail { bitmap -> swipeRefresh?.background = ColorDrawable(Color.TRANSPARENT)
lifecycleScope.launch { engineView?.asView()?.visibility = View.GONE
whenStarted { findNavController().nav(R.id.browserFragment, directions)
swipeRefresh?.background = bitmap?.toDrawable(it.resources)
engineView?.asView()?.visibility = View.GONE
findNavController().nav(R.id.browserFragment, directions)
}
}
}
} }
} }

27
app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
View File

@ -6,10 +6,11 @@ package org.mozilla.fenix.components.toolbar
import android.app.Activity import android.app.Activity
import android.content.Intent import android.content.Intent
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.annotation.VisibleForTesting import androidx.annotation.VisibleForTesting
import androidx.core.graphics.drawable.toDrawable
import androidx.core.widget.NestedScrollView import androidx.core.widget.NestedScrollView
import androidx.lifecycle.LifecycleCoroutineScope import androidx.lifecycle.LifecycleCoroutineScope
import androidx.navigation.NavController import androidx.navigation.NavController
@ -217,20 +218,16 @@ class DefaultBrowserToolbarController(
browserLayout, browserLayout,
"${TAB_ITEM_TRANSITION_NAME}${currentSession?.id}" "${TAB_ITEM_TRANSITION_NAME}${currentSession?.id}"
).build() ).build()
engineView.captureThumbnail { bitmap -> swipeRefresh.background = ColorDrawable(Color.TRANSPARENT)
scope.launch { engineView.asView().visibility = View.GONE
swipeRefresh.background = bitmap?.toDrawable(activity.resources) if (!navController.popBackStack(R.id.homeFragment, false)) {
engineView.asView().visibility = View.GONE navController.nav(
if (!navController.popBackStack(R.id.homeFragment, false)) { R.id.browserFragment,
navController.nav( R.id.action_browserFragment_to_homeFragment,
R.id.browserFragment, null,
R.id.action_browserFragment_to_homeFragment, options,
null, extras
options, )
extras
)
}
}
} }
} }