From 2e02bd5420a0ddee86b475b36059c30330db8867 Mon Sep 17 00:00:00 2001 From: Arkadii Ivanov Date: Tue, 20 Jul 2021 19:17:11 +0100 Subject: [PATCH] Removed BackPressedRegistry --- .../essenty/backpressed/BackPressedDispatcher.kt | 5 ++++- .../arkivanov/essenty/backpressed/BackPressedHandler.kt | 4 +++- .../arkivanov/essenty/backpressed/BackPressedRegistry.kt | 8 -------- 3 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 back-pressed/src/commonMain/kotlin/com/arkivanov/essenty/backpressed/BackPressedRegistry.kt diff --git a/back-pressed/src/commonMain/kotlin/com/arkivanov/essenty/backpressed/BackPressedDispatcher.kt b/back-pressed/src/commonMain/kotlin/com/arkivanov/essenty/backpressed/BackPressedDispatcher.kt index d5ebe86..515a497 100644 --- a/back-pressed/src/commonMain/kotlin/com/arkivanov/essenty/backpressed/BackPressedDispatcher.kt +++ b/back-pressed/src/commonMain/kotlin/com/arkivanov/essenty/backpressed/BackPressedDispatcher.kt @@ -2,7 +2,10 @@ package com.arkivanov.essenty.backpressed import kotlin.js.JsName -interface BackPressedDispatcher : BackPressedRegistry, BackPressedHandler +interface BackPressedDispatcher : BackPressedHandler { + + fun onBackPressed(): Boolean +} @JsName("backPressedDispatcher") @Suppress("FunctionName") diff --git a/back-pressed/src/commonMain/kotlin/com/arkivanov/essenty/backpressed/BackPressedHandler.kt b/back-pressed/src/commonMain/kotlin/com/arkivanov/essenty/backpressed/BackPressedHandler.kt index aacec25..d2081e6 100644 --- a/back-pressed/src/commonMain/kotlin/com/arkivanov/essenty/backpressed/BackPressedHandler.kt +++ b/back-pressed/src/commonMain/kotlin/com/arkivanov/essenty/backpressed/BackPressedHandler.kt @@ -2,5 +2,7 @@ package com.arkivanov.essenty.backpressed interface BackPressedHandler { - fun onBackPressed(): Boolean + fun register(handler: () -> Boolean) + + fun unregister(handler: () -> Boolean) } diff --git a/back-pressed/src/commonMain/kotlin/com/arkivanov/essenty/backpressed/BackPressedRegistry.kt b/back-pressed/src/commonMain/kotlin/com/arkivanov/essenty/backpressed/BackPressedRegistry.kt deleted file mode 100644 index de2055a..0000000 --- a/back-pressed/src/commonMain/kotlin/com/arkivanov/essenty/backpressed/BackPressedRegistry.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.arkivanov.essenty.backpressed - -interface BackPressedRegistry { - - fun register(handler: () -> Boolean) - - fun unregister(handler: () -> Boolean) -}