Collapsing toolbar layout (?)

app/src/main/java/org/koitharu/kotatsu/search/ui/MangaListActivity.kt

@@ -7,6 +7,7 @@ import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
+import com.google.android.material.appbar.AppBarLayout
 import org.koin.androidx.viewmodel.ext.android.getViewModel
 import org.koin.core.parameter.parametersOf
 import org.koitharu.kotatsu.R
@@ -14,12 +15,18 @@ import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaTags
 import org.koitharu.kotatsu.databinding.ActivityContainerBinding
 import org.koitharu.kotatsu.local.ui.LocalListFragment
+import org.koitharu.kotatsu.main.ui.AppBarOwner
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment
 import org.koitharu.kotatsu.remotelist.ui.RemoteListViewModel
 
-class MangaListActivity : BaseActivity<ActivityContainerBinding>() {
+class MangaListActivity :
+	BaseActivity<ActivityContainerBinding>(),
+	AppBarOwner {
+
+	override val appBar: AppBarLayout
+		get() = binding.appbar
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
@@ -81,4 +88,4 @@ class MangaListActivity : BaseActivity<ActivityContainerBinding>() {
 		fun newIntent(context: Context, source: MangaSource) = Intent(context, MangaListActivity::class.java)
 			.putExtra(EXTRA_SOURCE, source)
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt

@@ -45,17 +45,12 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQuery
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		with(binding.toolbar) {
-			updatePadding(
-				left = insets.left,
-				right = insets.right
-			)
-			updateLayoutParams<ViewGroup.MarginLayoutParams> {
-				topMargin = insets.top
-			}
-		}
+		binding.toolbar.updatePadding(
+			left = insets.left,
+			right = insets.right,
+		)
 		binding.container.updatePadding(
-			bottom = insets.bottom
+			bottom = insets.bottom,
 		)
 	}
 
@@ -85,4 +80,4 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQuery
 				.putExtra(EXTRA_SOURCE, source)
 				.putExtra(EXTRA_QUERY, query)
 	}
-}
+}