From cc79aac4c949b8015d59f7789de59219ee976c1c Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Fri, 21 Feb 2025 11:03:27 +0100 Subject: [PATCH] handle bottom insets in NotificationRequestDetailsActivity (#4930) Before ![before](https://github.com/user-attachments/assets/49df5f07-660f-49da-9fb4-98f86f76c1d0) After ![after](https://github.com/user-attachments/assets/7914703f-edcd-48e3-ae7a-69c2835f03ce) --- .../details/NotificationRequestDetailsActivity.kt | 11 ++++++++++- .../layout/activity_notification_request_details.xml | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/notifications/requests/details/NotificationRequestDetailsActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/notifications/requests/details/NotificationRequestDetailsActivity.kt index acc2c3807..64eda6a61 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/notifications/requests/details/NotificationRequestDetailsActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/notifications/requests/details/NotificationRequestDetailsActivity.kt @@ -19,6 +19,9 @@ import android.content.Context import android.content.Intent import android.os.Bundle import androidx.activity.viewModels +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat.Type.systemBars +import androidx.core.view.updatePadding import androidx.lifecycle.lifecycleScope import com.keylesspalace.tusky.BottomSheetActivity import com.keylesspalace.tusky.R @@ -69,6 +72,12 @@ class NotificationRequestDetailsActivity : BottomSheetActivity() { setDisplayShowHomeEnabled(true) } + ViewCompat.setOnApplyWindowInsetsListener(binding.bottomBar) { view, insets -> + val bottomInsets = insets.getInsets(systemBars()).bottom + view.updatePadding(bottom = bottomInsets) + insets.inset(0, 0, 0, bottomInsets) + } + lifecycleScope.launch { viewModel.finish.collect { finishMode -> setResult(RESULT_OK, Intent().apply { putExtra(EXTRA_NOTIFICATION_REQUEST_ID, intent.getStringExtra(EXTRA_NOTIFICATION_REQUEST_ID)!!) }) @@ -79,7 +88,7 @@ class NotificationRequestDetailsActivity : BottomSheetActivity() { binding.acceptButton.setOnClickListener { viewModel.acceptNotificationRequest() } - binding.dismissButtin.setOnClickListener { + binding.dismissButton.setOnClickListener { viewModel.dismissNotificationRequest() } } diff --git a/app/src/main/res/layout/activity_notification_request_details.xml b/app/src/main/res/layout/activity_notification_request_details.xml index 662524a33..f7da4c891 100644 --- a/app/src/main/res/layout/activity_notification_request_details.xml +++ b/app/src/main/res/layout/activity_notification_request_details.xml @@ -18,6 +18,7 @@ app:layout_behavior="@string/appbar_scrolling_view_behavior" />