From ee79c23fdf17c714d6afda85dfdb448647925433 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Mon, 17 Jan 2022 09:40:41 +0300
Subject: [PATCH] Use animation to hide/show fab

---
 .../koitharu/kotatsu/main/ui/MainActivity.kt    |  4 ++--
 .../kotatsu/widget/shelf/ShelfConfigActivity.kt | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
index c0c610ca1..f59e0210b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -102,7 +102,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 		binding.fab.setOnClickListener(this@MainActivity)
 
 		supportFragmentManager.findFragmentByTag(TAG_PRIMARY)?.let {
-			binding.fab.isVisible = it is HistoryListFragment
+			if (it is HistoryListFragment) binding.fab.show() else binding.fab.hide()
 		} ?: run {
 			openDefaultSection()
 		}
@@ -320,7 +320,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 		supportFragmentManager.beginTransaction()
 			.replace(R.id.container, fragment, TAG_PRIMARY)
 			.commit()
-		binding.fab.isVisible = fragment is HistoryListFragment
+		if (fragment is HistoryListFragment) binding.fab.show() else binding.fab.hide()
 	}
 
 	private fun onSearchOpened() {
diff --git a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt
index 8acc69b8b..b646b3896 100644
--- a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt
@@ -39,11 +39,10 @@ class ShelfConfigActivity : BaseActivity<ActivityCategoriesBinding>(),
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityCategoriesBinding.inflate(layoutInflater))
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
-		binding.fabAdd.imageTintList = ColorStateList.valueOf(Color.WHITE)
 		adapter = CategorySelectAdapter(this)
 		binding.recyclerView.addItemDecoration(DividerItemDecoration(this, RecyclerView.VERTICAL))
 		binding.recyclerView.adapter = adapter
-		binding.fabAdd.isVisible = false
+		binding.fabAdd.hide()
 		val appWidgetId = intent?.getIntExtra(
 			AppWidgetManager.EXTRA_APPWIDGET_ID,
 			AppWidgetManager.INVALID_APPWIDGET_ID
@@ -93,11 +92,15 @@ class ShelfConfigActivity : BaseActivity<ActivityCategoriesBinding>(),
 			right = insets.right,
 			bottom = insets.bottom
 		)
-		binding.toolbar.updatePadding(
-			left = insets.left,
-			right = insets.right,
-			top = insets.top
-		)
+		with(binding.toolbar) {
+			updatePadding(
+				left = insets.left,
+				right = insets.right
+			)
+			updateLayoutParams<ViewGroup.MarginLayoutParams> {
+				topMargin = insets.top
+			}
+		}
 	}
 
 	private fun onContentChanged(categories: List<CategoryItem>) {