Handle up navigation from reader

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt

@@ -6,7 +6,6 @@ import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
-import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.CallSuper
@@ -96,11 +95,10 @@ abstract class BaseActivity<B : ViewBinding> :
 		insetsDelegate.onViewCreated(binding.root)
 	}
 
-	override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
+	override fun onSupportNavigateUp(): Boolean {
-		onBackPressedDispatcher.onBackPressed()
+		dispatchNavigateUp()
-		// TODO: navigateUpTo
+		return true
-		true
+	}
-	} else super.onOptionsItemSelected(item)
 
 	override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
 		if (BuildConfig.DEBUG && keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
@@ -151,6 +149,17 @@ abstract class BaseActivity<B : ViewBinding> :
 		window.statusBarColor = defaultStatusBarColor
 	}
 
+	protected open fun dispatchNavigateUp() {
+		val upIntent = parentActivityIntent
+		if (upIntent != null) {
+			if (!navigateUpTo(upIntent)) {
+				startActivity(upIntent)
+			}
+		} else {
+			finishAfterTransition()
+		}
+	}
+
 	private fun putDataToExtras(intent: Intent?) {
 		intent?.putExtra(EXTRA_DATA, intent.data)
 	}

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt

@@ -83,7 +83,7 @@ fun <I> ActivityResultLauncher<I>.tryLaunch(
 	e.printStackTraceDebug()
 }.isSuccess
 
-fun SharedPreferences.observe() = callbackFlow<String?> {
+fun SharedPreferences.observe(): Flow<String?> = callbackFlow {
 	val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
 		trySendBlocking(key)
 	}

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt

@@ -183,7 +183,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 
 	override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
 		android.R.id.home -> if (isSearchOpened()) {
-			super.onOptionsItemSelected(item)
+			closeSearchCallback.handleOnBackPressed()
+			true
 		} else {
 			viewBinding.searchView.requestFocus()
 			true

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt

@@ -52,6 +52,7 @@ import org.koitharu.kotatsu.core.util.ext.postDelayed
 import org.koitharu.kotatsu.core.util.ext.setValueRounded
 import org.koitharu.kotatsu.core.util.ext.zipWithPrevious
 import org.koitharu.kotatsu.databinding.ActivityReaderBinding
+import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.reader.ui.config.ReaderConfigSheet
@@ -147,6 +148,11 @@ class ReaderActivity :
 		}
 	}
 
+	override fun getParentActivityIntent(): Intent? {
+		val manga = viewModel.manga?.toManga() ?: return null
+		return DetailsActivity.newIntent(this, manga)
+	}
+
 	override fun onUserInteraction() {
 		super.onUserInteraction()
 		scrollTimer.onUserInteraction()