blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For 11001 - Show close all tabs above tab tray

master
David Walsh 2020-05-28 13:31:05 -05:00 committed by Jeff Boek
parent a70ba76cc9
commit 267cf35edb
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,14 +261,14 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
} }
viewLifecycleOwner.lifecycleScope.allowUndo( viewLifecycleOwner.lifecycleScope.allowUndo(
requireView(), tabTrayDialog.requireView(),
snackbarMessage, snackbarMessage,
getString(R.string.snackbar_deleted_undo), getString(R.string.snackbar_deleted_undo),
{ {
sessionManager.restore(snapshot) sessionManager.restore(snapshot)
}, },
operation = { }, operation = { },
anchorView = view.tabs_header elevation = SNACKBAR_ELEVATION
) )
} }
@ -1072,5 +1072,6 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
private const val REQUEST_CODE_DOWNLOAD_PERMISSIONS = 1 private const val REQUEST_CODE_DOWNLOAD_PERMISSIONS = 1
private const val REQUEST_CODE_PROMPT_PERMISSIONS = 2 private const val REQUEST_CODE_PROMPT_PERMISSIONS = 2
private const val REQUEST_CODE_APP_PERMISSIONS = 3 private const val REQUEST_CODE_APP_PERMISSIONS = 3
private const val SNACKBAR_ELEVATION = 80f
} }
} }

7
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View File

@ -46,7 +46,6 @@ import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_home.*
import kotlinx.android.synthetic.main.fragment_home.view.* import kotlinx.android.synthetic.main.fragment_home.view.*
import kotlinx.android.synthetic.main.tab_header.view.*
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Dispatchers.Main
@ -1075,14 +1074,14 @@ class HomeFragment : Fragment() {
} }
viewLifecycleOwner.lifecycleScope.allowUndo( viewLifecycleOwner.lifecycleScope.allowUndo(
requireView(), tabTrayDialog.requireView(),
snackbarMessage, snackbarMessage,
getString(R.string.snackbar_deleted_undo), getString(R.string.snackbar_deleted_undo),
{ {
sessionManager.restore(snapshot) sessionManager.restore(snapshot)
}, },
operation = { }, operation = { },
anchorView = view?.tabs_header elevation = SNACKBAR_ELEVATION
) )
} }
@ -1130,6 +1129,8 @@ class HomeFragment : Fragment() {
// Layout // Layout
private const val HEADER_MARGIN = 60 private const val HEADER_MARGIN = 60
private const val SNACKBAR_ELEVATION = 80f
} }
} }