From 2ab0c336143bbb232f15d834ebcf3416dff7dfde Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Sun, 2 Feb 2025 19:53:17 +0100 Subject: [PATCH] use WindowInsetsCompat.inset api where possible --- .../java/com/keylesspalace/tusky/AboutActivity.kt | 6 +----- .../java/com/keylesspalace/tusky/LicenseActivity.kt | 6 +----- .../java/com/keylesspalace/tusky/MainActivity.kt | 6 +----- .../com/keylesspalace/tusky/TabPreferenceActivity.kt | 12 ++++-------- .../tusky/components/account/AccountActivity.kt | 6 +----- .../tusky/components/filters/EditFilterActivity.kt | 6 +----- .../components/preference/BasePreferencesFragment.kt | 6 +----- .../tusky/components/report/ReportActivity.kt | 6 +----- .../tusky/fragment/ViewImageFragment.kt | 7 ++----- .../tusky/fragment/ViewVideoFragment.kt | 6 +----- 10 files changed, 14 insertions(+), 53 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt index 3c98e47460..73180ac93d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt @@ -10,9 +10,7 @@ import android.text.style.URLSpan import android.text.util.Linkify import android.widget.TextView import androidx.annotation.StringRes -import androidx.core.graphics.Insets import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type.systemBars import androidx.core.view.updatePadding import androidx.lifecycle.lifecycleScope @@ -50,9 +48,7 @@ class AboutActivity : BottomSheetActivity() { val systemBarInsets = insets.getInsets(systemBars()) scrollView.updatePadding(bottom = systemBarInsets.bottom) - WindowInsetsCompat.Builder(insets) - .setInsets(systemBars(), Insets.of(systemBarInsets.left, systemBarInsets.top, systemBarInsets.right, 0)) - .build() + insets.inset(0, 0, 0, systemBarInsets.bottom) } binding.versionTextView.text = getString(R.string.about_app_version, getString(R.string.app_name), BuildConfig.VERSION_NAME) diff --git a/app/src/main/java/com/keylesspalace/tusky/LicenseActivity.kt b/app/src/main/java/com/keylesspalace/tusky/LicenseActivity.kt index 3bbad0a8f4..e4cd82b3bc 100644 --- a/app/src/main/java/com/keylesspalace/tusky/LicenseActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/LicenseActivity.kt @@ -19,9 +19,7 @@ import android.os.Bundle import android.util.Log import android.widget.TextView import androidx.annotation.RawRes -import androidx.core.graphics.Insets import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type.systemBars import androidx.core.view.updatePadding import androidx.lifecycle.lifecycleScope @@ -54,9 +52,7 @@ class LicenseActivity : BaseActivity() { val systemBarInsets = insets.getInsets(systemBars()) scrollView.updatePadding(bottom = systemBarInsets.bottom) - WindowInsetsCompat.Builder(insets) - .setInsets(systemBars(), Insets.of(systemBarInsets.left, systemBarInsets.top, systemBarInsets.right, 0)) - .build() + insets.inset(0, 0, 0, systemBarInsets.bottom) } loadFileIntoTextView(R.raw.apache, binding.licenseApacheTextView) diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt index 05d7456786..445bb3dd24 100644 --- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt @@ -48,11 +48,9 @@ import androidx.appcompat.content.res.AppCompatResources import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.app.ActivityCompat import androidx.core.content.pm.ShortcutManagerCompat -import androidx.core.graphics.Insets import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.core.view.MenuProvider import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type.systemBars import androidx.core.view.forEach import androidx.core.view.isVisible @@ -266,9 +264,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { insets } else { binding.viewPager.updatePadding(bottom = bottomBarHeight + bottomInsets) - WindowInsetsCompat.Builder(insets) - .setInsets(systemBars(), Insets.of(systemBarsInsets.left, systemBarsInsets.top, systemBarsInsets.right, 0)) - .build() + insets.inset(0, 0, 0, bottomInsets) } } } else { diff --git a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt index d533e114fb..90c2e1df98 100644 --- a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt @@ -20,9 +20,7 @@ import android.os.Bundle import android.view.View import android.view.ViewGroup import androidx.activity.OnBackPressedCallback -import androidx.core.graphics.Insets import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type.systemBars import androidx.core.view.updateLayoutParams import androidx.lifecycle.lifecycleScope @@ -90,17 +88,15 @@ class TabPreferenceActivity : BaseActivity(), ItemInteractionListener, ListSelec binding.currentTabsRecyclerView.ensureBottomPadding(fab = true) ViewCompat.setOnApplyWindowInsetsListener(binding.actionButton) { _, insets -> - val systemBarInsets = insets.getInsets(systemBars()) + val bottomInset = insets.getInsets(systemBars()).bottom val actionButtonMargin = resources.getDimensionPixelSize(R.dimen.fabMargin) binding.actionButton.updateLayoutParams { - bottomMargin = systemBarInsets.bottom + actionButtonMargin + bottomMargin = bottomInset + actionButtonMargin } binding.sheet.updateLayoutParams { - bottomMargin = systemBarInsets.bottom + actionButtonMargin + bottomMargin = bottomInset + actionButtonMargin } - WindowInsetsCompat.Builder(insets) - .setInsets(systemBars(), Insets.of(systemBarInsets.left, systemBarInsets.top, systemBarInsets.right, 0)) - .build() + insets.inset(0, 0, 0, bottomInset) } currentTabs = accountManager.activeAccount?.tabPreferences.orEmpty().toMutableList() diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt index ebd1c0cd04..98602b2a0c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt @@ -38,11 +38,9 @@ import androidx.annotation.Px import androidx.appcompat.content.res.AppCompatResources import androidx.core.app.ActivityOptionsCompat import androidx.core.graphics.ColorUtils -import androidx.core.graphics.Insets import androidx.core.view.MenuProvider import androidx.core.view.ViewCompat import androidx.core.view.WindowCompat -import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type.systemBars import androidx.core.view.updateLayoutParams import androidx.core.view.updatePadding @@ -303,9 +301,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide top + resources.getDimensionPixelSize(R.dimen.account_swiperefresh_distance) ) - WindowInsetsCompat.Builder(insets) - .setInsets(systemBars(), Insets.of(systemBarInsets.left, 0, systemBarInsets.right, systemBarInsets.bottom)) - .build() + insets.inset(0, top, 0, 0) } } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/filters/EditFilterActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/filters/EditFilterActivity.kt index a2cda21e81..81a5d5e15c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/filters/EditFilterActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/filters/EditFilterActivity.kt @@ -20,9 +20,7 @@ import android.os.Bundle import android.view.WindowManager import android.widget.AdapterView import androidx.activity.viewModels -import androidx.core.graphics.Insets import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type.systemBars import androidx.core.view.size import androidx.core.view.updatePadding @@ -99,9 +97,7 @@ class EditFilterActivity : BaseActivity() { ViewCompat.setOnApplyWindowInsetsListener(binding.scrollView) { scrollView, insets -> val systemBarsInsets = insets.getInsets(systemBars()) scrollView.updatePadding(bottom = systemBarsInsets.bottom) - WindowInsetsCompat.Builder(insets) - .setInsets(systemBars(), Insets.of(systemBarsInsets.left, systemBarsInsets.top, systemBarsInsets.right, 0)) - .build() + insets.inset(0, 0, 0, systemBarsInsets.bottom) } binding.actionChip.setOnClickListener { showAddKeywordDialog() } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/preference/BasePreferencesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/preference/BasePreferencesFragment.kt index 78925de857..ba452f0bb5 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/preference/BasePreferencesFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/preference/BasePreferencesFragment.kt @@ -2,9 +2,7 @@ package com.keylesspalace.tusky.components.preference import android.os.Bundle import android.view.View -import androidx.core.graphics.Insets import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type.systemBars import androidx.core.view.updatePadding import androidx.preference.PreferenceFragmentCompat @@ -16,9 +14,7 @@ abstract class BasePreferencesFragment : PreferenceFragmentCompat() { ViewCompat.setOnApplyWindowInsetsListener(listView) { listView, insets -> val systemBarsInsets = insets.getInsets(systemBars()) listView.updatePadding(bottom = systemBarsInsets.bottom) - WindowInsetsCompat.Builder(insets) - .setInsets(systemBars(), Insets.of(systemBarsInsets.left, systemBarsInsets.top, systemBarsInsets.right, 0)) - .build() + insets.inset(0, 0, 0, systemBarsInsets.bottom) } } } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt index 362d3a58a3..fa3a432516 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt @@ -19,9 +19,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import androidx.activity.viewModels -import androidx.core.graphics.Insets import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type.systemBars import androidx.core.view.updatePadding import androidx.lifecycle.lifecycleScope @@ -67,9 +65,7 @@ class ReportActivity : BottomSheetActivity() { val systemBarInsets = insets.getInsets(systemBars()) wizard.updatePadding(bottom = systemBarInsets.bottom) - WindowInsetsCompat.Builder(insets) - .setInsets(systemBars(), Insets.of(systemBarInsets.left, systemBarInsets.top, systemBarInsets.right, 0)) - .build() + insets.inset(0, 0, 0, systemBarInsets.bottom) } initViewPager() diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt index d95ff468e9..dc9721f095 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt @@ -27,9 +27,7 @@ import android.view.MotionEvent import android.view.View import android.view.ViewGroup import android.widget.ImageView -import androidx.core.graphics.Insets import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type.systemBars import androidx.core.view.updatePadding import androidx.lifecycle.lifecycleScope @@ -116,9 +114,8 @@ class ViewImageFragment : ViewMediaFragment() { val systemBarInsets = insets.getInsets(systemBars()) val mediaDescriptionBottomPadding = requireContext().resources.getDimensionPixelSize(R.dimen.media_description_sheet_bottom_padding) binding.mediaDescription.updatePadding(bottom = mediaDescriptionBottomPadding + systemBarInsets.bottom) - WindowInsetsCompat.Builder(insets) - .setInsets(systemBars(), Insets.of(systemBarInsets.left, systemBarInsets.top, systemBarInsets.right, 0)) - .build() + + insets.inset(0, 0, 0, systemBarInsets.bottom) } val singleTapDetector = GestureDetector( diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt index cfafbf4d54..e40d79be44 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt @@ -32,9 +32,7 @@ import android.widget.FrameLayout import android.widget.LinearLayout import androidx.annotation.OptIn import androidx.constraintlayout.widget.ConstraintLayout -import androidx.core.graphics.Insets import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type.systemBars import androidx.core.view.updateLayoutParams import androidx.core.view.updatePadding @@ -144,9 +142,7 @@ class ViewVideoFragment : ViewMediaFragment() { bottomMargin = systemBarInsets.bottom } - WindowInsetsCompat.Builder(insets) - .setInsets(systemBars(), Insets.of(systemBarInsets.left, systemBarInsets.top, systemBarInsets.right, 0)) - .build() + insets.inset(0, 0, 0, systemBarInsets.bottom) } /**