From 9672f0eb583430c6e6045510b5393ebe2b9f5ad7 Mon Sep 17 00:00:00 2001 From: Maxim Bachinsky Date: Wed, 20 Feb 2019 15:12:03 +0300 Subject: [PATCH] fix back pressed order (#10) --- .../components/navigation/activities/BaseActivity.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.kt b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.kt index f2c4224..191732b 100644 --- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.kt +++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.kt @@ -21,10 +21,9 @@ package ru.touchin.roboswag.components.navigation.activities import android.content.Intent import android.os.Bundle -import androidx.collection.ArraySet import androidx.appcompat.app.AppCompatActivity +import androidx.collection.ArraySet import ru.touchin.roboswag.components.navigation.viewcontrollers.LifecycleLoggingObserver - import ru.touchin.roboswag.core.log.Lc import ru.touchin.roboswag.core.log.LcGroup @@ -68,7 +67,7 @@ abstract class BaseActivity : AppCompatActivity() { } override fun onBackPressed() { - onBackPressedListeners.forEach { onBackPressedListener -> + onBackPressedListeners.reversed().forEach { onBackPressedListener -> if (onBackPressedListener.onBackPressed()) { return }