From 1811e4fca37a7ae7ff8ab7c6ef8c7d3121e7fb49 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Wed, 22 Jan 2025 07:38:27 -0500 Subject: [PATCH] Renamed funs --- .../designsystem/DesignSystemActivity.kt | 2 +- .../BloggingPromptsListActivity.kt | 2 +- .../DebugSharedPreferenceFlagsActivity.kt | 2 +- .../management/DomainManagementActivity.kt | 2 +- .../NewDomainSearchActivity.kt | 2 +- .../purchasedomain/PurchaseDomainActivity.kt | 2 +- .../JetpackStaticPosterActivity.kt | 2 +- .../JetpackFullPluginInstallActivity.kt | 2 +- .../JetpackRemoteInstallActivity.kt | 2 +- .../android/ui/main/BaseAppCompatActivity.kt | 26 +++++++++++-------- .../main/feedbackform/FeedbackFormActivity.kt | 2 +- .../ui/media/MediaPreviewActivity.java | 2 +- .../android/ui/mysite/menu/MenuActivity.kt | 2 +- .../PersonalizationActivity.kt | 2 +- .../EditJetpackSocialShareMessageActivity.kt | 2 +- .../ui/prefs/ExperimentalFeaturesActivity.kt | 2 +- .../SelfHostedUsersActivity.kt | 2 +- 17 files changed, 31 insertions(+), 27 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemActivity.kt b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemActivity.kt index 15c7cc23cb68..f1a2f2aa2d32 100644 --- a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemActivity.kt @@ -18,7 +18,7 @@ class DesignSystemActivity : BaseAppCompatActivity() { } } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false @Preview(name = "Light Mode") @Preview( diff --git a/WordPress/src/main/java/org/wordpress/android/ui/bloggingprompts/promptslist/BloggingPromptsListActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/bloggingprompts/promptslist/BloggingPromptsListActivity.kt index 21b6ca27422b..dc285eba982b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/bloggingprompts/promptslist/BloggingPromptsListActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/bloggingprompts/promptslist/BloggingPromptsListActivity.kt @@ -36,7 +36,7 @@ class BloggingPromptsListActivity : BaseAppCompatActivity() { observeActions() } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false /** * Since we're declaring that this Activity handles orientation changes by itself in the diff --git a/WordPress/src/main/java/org/wordpress/android/ui/debug/preferences/DebugSharedPreferenceFlagsActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/debug/preferences/DebugSharedPreferenceFlagsActivity.kt index 79219ad8c5d7..ffef77f44a2e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/debug/preferences/DebugSharedPreferenceFlagsActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/debug/preferences/DebugSharedPreferenceFlagsActivity.kt @@ -27,5 +27,5 @@ class DebugSharedPreferenceFlagsActivity : BaseAppCompatActivity() { } } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/DomainManagementActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/DomainManagementActivity.kt index 1f572986b2e3..00e9a70c6a2c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/DomainManagementActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/DomainManagementActivity.kt @@ -39,7 +39,7 @@ class DomainManagementActivity : BaseAppCompatActivity() { viewModel.actionEvents.onEach(this::handleActionEvents).launchIn(lifecycleScope) } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false private fun handleActionEvents(actionEvent: ActionEvent) { when (actionEvent) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchActivity.kt index 22d4b70a7b55..5734679d4330 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchActivity.kt @@ -40,7 +40,7 @@ class NewDomainSearchActivity : BaseAppCompatActivity() { observeActions() } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false private fun observeActions() { viewModel.actionEvents.onEach(this::handleActionEvents).launchIn(lifecycleScope) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainActivity.kt index 456b7fe5f674..787047952815 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainActivity.kt @@ -78,7 +78,7 @@ class PurchaseDomainActivity : BaseAppCompatActivity() { observeActions() } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false private fun observeActions() { viewModel.actionEvents.onEach(this::handleActionEvents).launchIn(lifecycleScope) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpackoverlay/JetpackStaticPosterActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpackoverlay/JetpackStaticPosterActivity.kt index 3c4bee954d2d..283273ca8c41 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/jetpackoverlay/JetpackStaticPosterActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpackoverlay/JetpackStaticPosterActivity.kt @@ -44,5 +44,5 @@ class JetpackStaticPosterActivity : BaseAppCompatActivity() { ) } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpackplugininstall/fullplugin/install/JetpackFullPluginInstallActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpackplugininstall/fullplugin/install/JetpackFullPluginInstallActivity.kt index ac63fc5d4235..d6a9abc21901 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/jetpackplugininstall/fullplugin/install/JetpackFullPluginInstallActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpackplugininstall/fullplugin/install/JetpackFullPluginInstallActivity.kt @@ -42,7 +42,7 @@ class JetpackFullPluginInstallActivity : BaseAppCompatActivity() { observeActionEvents() } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false @Suppress("OVERRIDE_DEPRECATION","MissingSuperCall") override fun onBackPressed() { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpackplugininstall/remoteplugin/JetpackRemoteInstallActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpackplugininstall/remoteplugin/JetpackRemoteInstallActivity.kt index 7ac6e6fc5cbb..ca40a499548b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/jetpackplugininstall/remoteplugin/JetpackRemoteInstallActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpackplugininstall/remoteplugin/JetpackRemoteInstallActivity.kt @@ -61,7 +61,7 @@ class JetpackRemoteInstallActivity : BaseAppCompatActivity() { } } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false private fun initViewModel(savedInstanceState: Bundle?) { val site = requireNotNull(intent.getSerializableExtraCompat(WordPress.SITE)) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/BaseAppCompatActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/BaseAppCompatActivity.kt index e0ec845f611e..3858dc09e2c5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/BaseAppCompatActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/BaseAppCompatActivity.kt @@ -15,26 +15,24 @@ open class BaseAppCompatActivity : AppCompatActivity() { @Override override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) && shouldEnforceEdgeToEdge()) { - enforceEdgeToEdge() + if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) && shouldAdjustSystemBarsForEdgeToEdge()) { + adjustSystemBarsForEdgeToEdge() } } @RequiresApi(Build.VERSION_CODES.R) - private fun enforceEdgeToEdge() { + private fun adjustSystemBarsForEdgeToEdge() { window.decorView.setOnApplyWindowInsetsListener { view, insets -> // set the system bars color val systemBarColor = getColorFromAttribute(com.google.android.material.R.attr.colorSurface) view.setBackgroundColor(systemBarColor) // Adjust system bars padding to avoid overlap - val statusBarInsets = insets.getInsets(WindowInsets.Type.statusBars()) - val navigationBarInsets = insets.getInsets(WindowInsets.Type.navigationBars()) view.setPadding( 0, - statusBarInsets.top, + getTopOffset(insets), 0, - navigationBarInsets.bottom + getBottomOffset(insets) ) insets @@ -42,9 +40,15 @@ open class BaseAppCompatActivity : AppCompatActivity() { } /** - * Defaults to enforcing edge-to-edge on Android 15+, but descendants can override this to return - * false for cases such as Compose-based activities where edge-to-edge is automatically supported, - * or full-screen activities where we don't want to alter the window insets + * Defaults to enforcing system bar padding for edge-to-edge on Android 15+ - descendants can override this and + * return false for cases such as Compose-based activities where edge-to-edge is automatically supported, + * or full-screen activities where we don't want to alter the window insets. */ - open fun shouldEnforceEdgeToEdge() = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) + open fun shouldAdjustSystemBarsForEdgeToEdge() = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) + + @RequiresApi(Build.VERSION_CODES.R) + open fun getTopOffset(insets: WindowInsets) = insets.getInsets(WindowInsets.Type.statusBars()).top + + @RequiresApi(Build.VERSION_CODES.R) + open fun getBottomOffset(insets: WindowInsets) = insets.getInsets(WindowInsets.Type.navigationBars()).bottom } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormActivity.kt index 76be796850fb..5de434c4d5e5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormActivity.kt @@ -57,7 +57,7 @@ class FeedbackFormActivity : BaseAppCompatActivity() { ) } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false private fun navigateToHelpScreen() { val intent = Intent(this, HelpActivity::class.java) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaPreviewActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaPreviewActivity.java index 06590f68a569..21bc2cd1b7f6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaPreviewActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaPreviewActivity.java @@ -220,7 +220,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { } @Override - public boolean shouldEnforceEdgeToEdge() { + public boolean shouldAdjustSystemBarsForEdgeToEdge() { return false; } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuActivity.kt index 79bcd914f2a9..7e82c0355269 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuActivity.kt @@ -104,7 +104,7 @@ class MenuActivity : BaseAppCompatActivity() { } } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false @Suppress("OVERRIDE_DEPRECATION") override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/personalization/PersonalizationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/personalization/PersonalizationActivity.kt index 86bf5f79c702..b12ceb434c9a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/personalization/PersonalizationActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/personalization/PersonalizationActivity.kt @@ -81,7 +81,7 @@ class PersonalizationActivity : BaseAppCompatActivity() { viewModel.onSelectedSiteMissing.observe(this) { finish() } } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/sharemessage/EditJetpackSocialShareMessageActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/sharemessage/EditJetpackSocialShareMessageActivity.kt index 4748ebe76286..fde189aacd81 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/sharemessage/EditJetpackSocialShareMessageActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/sharemessage/EditJetpackSocialShareMessageActivity.kt @@ -76,7 +76,7 @@ class EditJetpackSocialShareMessageActivity : BaseAppCompatActivity() { } } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false @Composable private fun Loaded(state: UiState.Loaded) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/ExperimentalFeaturesActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/ExperimentalFeaturesActivity.kt index 6b3660ac9e98..f2936590e836 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/ExperimentalFeaturesActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/ExperimentalFeaturesActivity.kt @@ -95,7 +95,7 @@ class ExperimentalFeaturesActivity : BaseAppCompatActivity() { } } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false } @OptIn(ExperimentalMaterial3Api::class) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersActivity.kt index 509db95364c3..8038d247835e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersActivity.kt @@ -60,7 +60,7 @@ class SelfHostedUsersActivity : BaseAppCompatActivity() { ) } - override fun shouldEnforceEdgeToEdge() = false + override fun shouldAdjustSystemBarsForEdgeToEdge() = false override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState)