Skip to content

SES - 4683 : UI Artifact When Opening New Conversation #1628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 23, 2025
Merged

SES - 4683 : UI Artifact When Opening New Conversation #1628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b0626b3
Add own inset listener to fab
jbsession Oct 21, 2025
e27edff
new message fab inset
jbsession Oct 22, 2025
adda373
Update typemask for inset
jbsession Oct 22, 2025
9d2c537
Revert "Update typemask for inset"
jbsession Oct 22, 2025
1fc5602
updated safe insets margins
jbsession Oct 23, 2025
27a24c4
Fix typemas
jbsession Oct 23, 2025
005623f
Consume inset false
jbsession Oct 23, 2025
5b0bb14
Merge branch 'dev' into fix/ses-4683
jbsession Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.ViewCompositionStrategy
import androidx.core.graphics.Insets
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.isVisible
import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
Expand Down Expand Up @@ -86,13 +89,13 @@ import org.thoughtcrime.securesms.reviews.ui.InAppReview
import org.thoughtcrime.securesms.reviews.ui.InAppReviewViewModel
import org.thoughtcrime.securesms.showSessionDialog
import org.thoughtcrime.securesms.tokenpage.TokenPageNotificationManager
import org.thoughtcrime.securesms.ui.ObserveAsEvents
import org.thoughtcrime.securesms.ui.UINavigator
import org.thoughtcrime.securesms.ui.components.Avatar
import org.thoughtcrime.securesms.ui.setThemedContent
import org.thoughtcrime.securesms.ui.theme.LocalDimensions
import org.thoughtcrime.securesms.util.AvatarUtils
import org.thoughtcrime.securesms.util.DateUtils
import org.thoughtcrime.securesms.util.applySafeInsetsMargins
import org.thoughtcrime.securesms.util.applySafeInsetsPaddings
import org.thoughtcrime.securesms.util.disableClipping
import org.thoughtcrime.securesms.util.fadeIn
Expand Down Expand Up @@ -415,16 +418,6 @@ class HomeActivity : ScreenLockActionBarActivity(),
}
}

binding.root.applySafeInsetsPaddings(
applyBottom = false,
alsoApply = { insets ->
binding.globalSearchRecycler.updatePadding(bottom = insets.bottom)
binding.newConversationButton.updateLayoutParams<MarginLayoutParams> {
bottomMargin = insets.bottom + resources.getDimensionPixelSize(R.dimen.new_conversation_button_bottom_offset)
}
}
)

// Set up in-app review
binding.inAppReviewView.setThemedContent {
InAppReview(
Expand All @@ -433,6 +426,8 @@ class HomeActivity : ScreenLockActionBarActivity(),
sendCommands = inAppReviewViewModel::sendUiCommand,
)
}

applyViewInsets()
}

override fun onCancelClicked() {
Expand Down Expand Up @@ -893,6 +888,21 @@ class HomeActivity : ScreenLockActionBarActivity(),
private fun showStartConversation() {
homeViewModel.onCommand(HomeViewModel.Commands.ShowStartConversationSheet)
}

private fun applyViewInsets() {
binding.root.applySafeInsetsPaddings(
applyBottom = false,
consumeInsets = false,
alsoApply = { insets ->
binding.globalSearchRecycler.updatePadding(bottom = insets.bottom)
}
)

binding.newConversationButton.applySafeInsetsMargins(
typeMask = WindowInsetsCompat.Type.navigationBars(),
additionalInsets = Insets.of(0,0,0, resources.getDimensionPixelSize(R.dimen.new_conversation_button_bottom_offset))
)
}
}

fun Context.startHomeActivity(isFromOnboarding: Boolean, isNewAccount: Boolean) {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ fun View.applySafeInsetsMargins(
consumeInsets: Boolean = true,
@InsetsType
typeMask: Int = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime(),
additionalInsets : Insets = Insets.NONE // for additional offsets
) {
ViewCompat.setOnApplyWindowInsetsListener(this) { view, windowInsets ->
// Get system bars insets
Expand All @@ -162,7 +163,7 @@ fun View.applySafeInsetsMargins(
// Update view margins to account for system bars
val lp = view.layoutParams as? MarginLayoutParams
if (lp != null) {
lp.setMargins(systemBarsInsets.left, systemBarsInsets.top, systemBarsInsets.right, systemBarsInsets.bottom)
lp.setMargins(additionalInsets.left + systemBarsInsets.left, additionalInsets.top + systemBarsInsets.top, additionalInsets.right + systemBarsInsets.right, additionalInsets.bottom + systemBarsInsets.bottom)
view.layoutParams = lp

if (consumeInsets) {
Expand Down