From 890c13d83a815f48fec808c57e03ecb801bcc587 Mon Sep 17 00:00:00 2001 From: Zakhar Timoshenko Date: Mon, 8 Aug 2022 04:47:05 +0300 Subject: [PATCH] Insets suffering continue --- .../kotatsu/bookmarks/ui/BookmarksActivity.kt | 14 +++++++------- .../koitharu/kotatsu/browser/BrowserActivity.kt | 10 +++++----- .../kotatsu/download/ui/DownloadsActivity.kt | 8 +++----- .../kotatsu/favourites/ui/FavouritesActivity.kt | 2 +- .../ui/categories/FavouriteCategoriesActivity.kt | 8 +++++--- .../edit/FavouritesCategoryEditActivity.kt | 4 +++- .../koitharu/kotatsu/history/ui/HistoryActivity.kt | 6 ------ .../org/koitharu/kotatsu/main/ui/MainActivity.kt | 7 ++++++- .../kotatsu/search/ui/multi/MultiSearchActivity.kt | 4 +--- .../kotatsu/suggestions/ui/SuggestionsActivity.kt | 6 ------ .../java/org/koitharu/kotatsu/utils/ext/ViewExt.kt | 1 - app/src/main/res/layout/fragment_list.xml | 2 +- 12 files changed, 32 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksActivity.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksActivity.kt index b15e76657..1bcc16d2e 100644 --- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksActivity.kt @@ -3,8 +3,10 @@ package org.koitharu.kotatsu.bookmarks.ui import android.content.Context import android.content.Intent import android.os.Bundle +import android.view.ViewGroup import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.graphics.Insets +import androidx.core.view.updateLayoutParams import androidx.core.view.updatePadding import androidx.fragment.app.commit import com.google.android.material.appbar.AppBarLayout @@ -25,7 +27,7 @@ class BookmarksActivity : get() = binding.appbar override val snackbarHost: CoordinatorLayout - get() = binding.coordinator + get() = binding.root override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -41,12 +43,10 @@ class BookmarksActivity : } override fun onWindowInsetsChanged(insets: Insets) { - with(binding.toolbar) { - updatePadding( - left = insets.left, - right = insets.right, - ) - } + binding.root.updatePadding( + left = insets.left, + right = insets.right, + ) } companion object { diff --git a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt index 601aac6e7..81968d794 100644 --- a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt @@ -8,14 +8,16 @@ import android.net.Uri import android.os.Bundle import android.view.Menu import android.view.MenuItem +import android.view.ViewGroup import androidx.core.graphics.Insets import androidx.core.view.isVisible +import androidx.core.view.updateLayoutParams import androidx.core.view.updatePadding +import com.google.android.material.R as materialR import org.koitharu.kotatsu.R import org.koitharu.kotatsu.base.ui.BaseActivity import org.koitharu.kotatsu.core.network.UserAgentInterceptor import org.koitharu.kotatsu.databinding.ActivityBrowserBinding -import com.google.android.material.R as materialR @SuppressLint("SetJavaScriptEnabled") class BrowserActivity : BaseActivity(), BrowserCallback { @@ -42,7 +44,7 @@ class BrowserActivity : BaseActivity(), BrowserCallback } else { onTitleChanged( intent?.getStringExtra(EXTRA_TITLE) ?: getString(R.string.loading_), - url + url, ) binding.webView.loadUrl(url) } @@ -117,8 +119,6 @@ class BrowserActivity : BaseActivity(), BrowserCallback override fun onWindowInsetsChanged(insets: Insets) { binding.appbar.updatePadding( top = insets.top, - left = insets.left, - right = insets.right, ) binding.root.updatePadding( left = insets.left, @@ -137,4 +137,4 @@ class BrowserActivity : BaseActivity(), BrowserCallback .putExtra(EXTRA_TITLE, title) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt index 07124490d..61724a6db 100644 --- a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt @@ -45,14 +45,12 @@ class DownloadsActivity : BaseActivity() { } override fun onWindowInsetsChanged(insets: Insets) { - binding.recyclerView.updatePadding( + binding.root.updatePadding( left = insets.left, right = insets.right, - bottom = insets.bottom, ) - binding.toolbar.updatePadding( - left = insets.left, - right = insets.right, + binding.recyclerView.updatePadding( + bottom = insets.bottom, ) } diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesActivity.kt index 396304cd9..8f0ffe33f 100644 --- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesActivity.kt @@ -35,7 +35,7 @@ class FavouritesActivity : BaseActivity() { } override fun onWindowInsetsChanged(insets: Insets) { - binding.toolbar.updatePadding( + binding.root.updatePadding( left = insets.left, right = insets.right, ) diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt index 8d82dd03a..470876014 100644 --- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt @@ -136,10 +136,12 @@ class FavouriteCategoriesActivity : leftMargin = topMargin + insets.left bottomMargin = topMargin + insets.bottom } - binding.recyclerView.updatePadding( + binding.root.updatePadding( left = insets.left, - right = insets.right, - bottom = 2 * insets.bottom + binding.fabAdd.measureHeight(), + right = insets.right + ) + binding.recyclerView.updatePadding( + bottom = insets.bottom, ) } diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt index 330e72f18..fb0c023c4 100644 --- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt @@ -94,9 +94,11 @@ class FavouritesCategoryEditActivity : } override fun onWindowInsetsChanged(insets: Insets) { - binding.scrollView.updatePadding( + binding.root.updatePadding( left = insets.left, right = insets.right, + ) + binding.scrollView.updatePadding( bottom = insets.bottom, ) binding.toolbar.updateLayoutParams { diff --git a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryActivity.kt b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryActivity.kt index fdc8897b2..569cea6ef 100644 --- a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryActivity.kt @@ -3,9 +3,7 @@ package org.koitharu.kotatsu.history.ui import android.content.Context import android.content.Intent import android.os.Bundle -import android.view.ViewGroup import androidx.core.graphics.Insets -import androidx.core.view.updateLayoutParams import androidx.core.view.updatePadding import androidx.fragment.app.commit import com.google.android.material.appbar.AppBarLayout @@ -37,10 +35,6 @@ class HistoryActivity : } override fun onWindowInsetsChanged(insets: Insets) { - binding.toolbar.updateLayoutParams { - leftMargin = insets.left - rightMargin = insets.right - } binding.root.updatePadding( left = insets.left, right = insets.right, 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 14e5b75f7..48349e846 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 @@ -157,7 +157,12 @@ class MainActivity : } } - override fun onWindowInsetsChanged(insets: Insets) = Unit + override fun onWindowInsetsChanged(insets: Insets) { + binding.root.updatePadding( + left = insets.left, + right = insets.right, + ) + } override fun onFocusChange(v: View?, hasFocus: Boolean) { val fragment = supportFragmentManager.findFragmentByTag(TAG_SEARCH) diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchActivity.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchActivity.kt index 28cabbcbc..0e595cfbe 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchActivity.kt @@ -90,14 +90,12 @@ class MultiSearchActivity : } override fun onWindowInsetsChanged(insets: Insets) { - binding.toolbar.updatePadding( + binding.root.updatePadding( left = insets.left, right = insets.right, ) binding.recyclerView.updatePadding( bottom = insets.bottom, - left = insets.left, - right = insets.right, ) } diff --git a/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsActivity.kt index 877ced0fd..9e7c38849 100644 --- a/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsActivity.kt @@ -3,9 +3,7 @@ package org.koitharu.kotatsu.suggestions.ui import android.content.Context import android.content.Intent import android.os.Bundle -import android.view.ViewGroup import androidx.core.graphics.Insets -import androidx.core.view.updateLayoutParams import androidx.core.view.updatePadding import androidx.fragment.app.commit import com.google.android.material.appbar.AppBarLayout @@ -37,10 +35,6 @@ class SuggestionsActivity : } override fun onWindowInsetsChanged(insets: Insets) { - binding.toolbar.updateLayoutParams { - leftMargin = insets.left - rightMargin = insets.right - } binding.root.updatePadding( left = insets.left, right = insets.right, diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt index 5044ab6f1..e6c4e11e1 100644 --- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt +++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt @@ -6,7 +6,6 @@ import android.view.View import android.view.ViewGroup import android.view.ViewParent import android.view.inputmethod.InputMethodManager -import androidx.core.view.ViewCompat import androidx.core.view.children import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml index b109ed6ac..086aa7c8e 100644 --- a/app/src/main/res/layout/fragment_list.xml +++ b/app/src/main/res/layout/fragment_list.xml @@ -24,4 +24,4 @@ - \ No newline at end of file +