TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-24 10:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed backpress not working

Browse Source
This commit is contained in:
Viktor De Pasquale 2019-05-02 16:03:56 +02:00
parent 628b37c4fa
commit 50134a2f9b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt
View File

@ -44,6 +44,9 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
FragNavController(supportFragmentManager, navHostId) FragNavController(supportFragmentManager, navHostId)
} }
private val isRootFragment
get() = navigationController?.let { it.currentStackIndex != defaultPosition } ?: false
init { init {
val isDarkTheme = Config.get<Boolean>(Config.Key.DARK_THEME) val isDarkTheme = Config.get<Boolean>(Config.Key.DARK_THEME)
val theme = if (isDarkTheme) { val theme = if (isDarkTheme) {
@ -148,7 +151,7 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
navigationController?.popFragment() ?: throw UnsupportedOperationException() navigationController?.popFragment() ?: throw UnsupportedOperationException()
} catch (e: UnsupportedOperationException) { } catch (e: UnsupportedOperationException) {
when { when {
navigationController?.currentStackIndex != defaultPosition -> { isRootFragment -> {
val options = FragNavTransactionOptions.newBuilder() val options = FragNavTransactionOptions.newBuilder()
.transition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE) .transition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
.build() .build()