Michatec/michas-droid
1
1
Fork 0
mirror of https://github.com/Michatec/michas-droid.git synced 2026-05-31 02:12:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better back press handling

Browse Source
This commit is contained in:
kitsunyan
2020-07-04 03:14:23 +03:00
parent c34574c014
commit ba3936311e
10 changed files with 61 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/kotlin/nya/kitsunyan/foxydroid/screen/ScreenActivity.kt
+4 -9
View File
@@ -21,7 +21,6 @@ import nya.kitsunyan.foxydroid.utility.Utils
import nya.kitsunyan.foxydroid.utility.extension.android.*
import nya.kitsunyan.foxydroid.utility.extension.resources.*
import nya.kitsunyan.foxydroid.utility.extension.text.*
import java.lang.ref.WeakReference
abstract class ScreenActivity: FragmentActivity() {
companion object {
@@ -58,7 +57,6 @@ abstract class ScreenActivity: FragmentActivity() {
private set
private val fragmentStack = mutableListOf<FragmentStackItem>()
private var toolbar: WeakReference<Toolbar>? = null
private val currentFragment: Fragment?
get() {
@@ -105,10 +103,8 @@ abstract class ScreenActivity: FragmentActivity() {
}
override fun onBackPressed() {
val menuItem = toolbar?.get()?.menu?.findItem(R.id.toolbar_search)
if (menuItem != null && menuItem.isActionViewExpanded) {
menuItem.collapseActionView()
} else {
val currentFragment = currentFragment
if (!(currentFragment is ScreenFragment && currentFragment.onBackPressed())) {
hideKeyboard()
if (!popFragment()) {
super.onBackPressed()
@@ -159,9 +155,8 @@ abstract class ScreenActivity: FragmentActivity() {
hideKeyboard()
}
internal fun onFragmentViewCreated(toolbar: Toolbar?) {
this.toolbar = toolbar?.let(::WeakReference)
if (fragmentStack.isNotEmpty() && toolbar != null) {
internal fun onToolbarCreated(toolbar: Toolbar) {
if (fragmentStack.isNotEmpty()) {
toolbar.navigationIcon = toolbar.context.getDrawableFromAttr(android.R.attr.homeAsUpIndicator)
toolbar.setNavigationOnClickListener { onBackPressed() }
}