wbrawner/SimpleMarkdown
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix dialog dismissal when returning from settings

Browse source
This commit is contained in:
Billy Brawner 2019-11-07 17:20:40 -06:00
parent 241f0868cd
commit b747c87d23
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/wbrawner/simplemarkdown/view/activity/MainActivity.kt
View file

@ -206,7 +206,6 @@ class MainActivity : AppCompatActivity(), ActivityCompat.OnRequestPermissionsRes
viewModel.save(this@MainActivity, data.data)
}
}
REQUEST_DARK_MODE -> recreate()
}
super.onActivityResult(requestCode, resultCode, data)
}

10
app/src/main/java/com/wbrawner/simplemarkdown/view/fragment/MainMenuFragment.kt
View file

@ -40,7 +40,6 @@ class MainMenuFragment : BottomSheetDialogFragment(), CoroutineScope {
R.id.action_settings -> {
val settingsIntent = Intent(context, SettingsActivity::class.java)
startActivityForResult(settingsIntent, MainActivity.REQUEST_DARK_MODE)
dialog?.dismiss()
}
R.id.action_libraries -> showInfoActivity(context, R.id.action_libraries)
R.id.action_privacy -> showInfoActivity(context, R.id.action_privacy)
@ -54,6 +53,15 @@ class MainMenuFragment : BottomSheetDialogFragment(), CoroutineScope {
}
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (requestCode == MainActivity.REQUEST_DARK_MODE) {
activity?.recreate()
dialog?.dismiss()
return
}
super.onActivityResult(requestCode, resultCode, data)
}
private fun showInfoActivity(context: Context?, action: Int) {
val infoIntent = Intent(context, MarkdownInfoActivity::class.java)
var fileName = ""