Upgrade compose bom to 2025.11.01

app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsScreen.kt

@@ -9,6 +9,7 @@ import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.widget.Toast
 import androidx.activity.ComponentActivity
+import androidx.activity.compose.LocalActivity
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
@@ -21,7 +22,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
@@ -64,11 +64,11 @@ fun CallLinkDetailsScreen(
   viewModel: CallLinkDetailsViewModel = viewModel {
     CallLinkDetailsViewModel(roomId)
   },
-  router: MainNavigationRouter = viewModel<MainNavigationViewModel>(viewModelStoreOwner = LocalContext.current as ComponentActivity) {
+  router: MainNavigationRouter = viewModel<MainNavigationViewModel>(viewModelStoreOwner = LocalActivity.current as ComponentActivity) {
     error("Should already be created.")
   }
 ) {
-  val activity = LocalContext.current as FragmentActivity
+  val activity = LocalActivity.current as FragmentActivity
   val callback = remember {
     DefaultCallLinkDetailsCallback(
       activity = activity,

app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt

@@ -8,6 +8,7 @@ package org.thoughtcrime.securesms.calls.new
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.compose.LocalActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.fillMaxSize
@@ -80,7 +81,7 @@ private fun NewCallScreen(
   viewModel: NewCallViewModel = viewModel { NewCallViewModel() },
   closeScreen: () -> Unit
 ) {
-  val context = LocalContext.current as FragmentActivity
+  val context = LocalActivity.current as FragmentActivity
 
   val callbacks = remember {
     object : UiCallbacks {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/search/InternalSearchFragment.kt

@@ -7,6 +7,7 @@
 
 package org.thoughtcrime.securesms.components.settings.app.internal.search
 
+import androidx.activity.compose.LocalActivity
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -24,7 +25,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.viewModels
 import kotlinx.collections.immutable.ImmutableList
@@ -87,7 +87,7 @@ fun SearchBar(query: String, onSearchUpdated: (String) -> Unit, modifier: Modifi
 
 @Composable
 fun ResultItem(result: InternalSearchResult, modifier: Modifier = Modifier) {
-  val activity = LocalContext.current as? AppCompatActivity
+  val activity = LocalActivity.current as? AppCompatActivity
 
   Column(
     modifier = modifier

app/src/main/java/org/thoughtcrime/securesms/compose/StatusBarColorNestedScrollConnection.kt

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.compose
 
 import android.animation.ValueAnimator
 import android.app.Activity
+import androidx.activity.compose.LocalActivity
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -10,7 +11,6 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.NestedScrollSource
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.Velocity
 import androidx.core.content.ContextCompat
 import com.google.android.material.animation.ArgbEvaluatorCompat
@@ -96,7 +96,7 @@ class StatusBarColorNestedScrollConnection(
  */
 @Composable
 fun rememberStatusBarColorNestedScrollModifier(): Modifier {
-  val activity = LocalContext.current as? AppCompatActivity
+  val activity = LocalActivity.current as? AppCompatActivity
 
   return remember {
     if (activity != null) {

app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt

@@ -9,6 +9,7 @@ import android.app.Activity.RESULT_OK
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.compose.LocalActivity
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -96,7 +97,7 @@ private fun NewConversationScreen(
   activityIntent: Intent,
   closeScreen: () -> Unit
 ) {
-  val context = LocalContext.current as FragmentActivity
+  val context = LocalActivity.current as FragmentActivity
 
   val createGroupLauncher: ActivityResultLauncher<Intent> = rememberLauncherForActivityResult(
     contract = ActivityResultContracts.StartActivityForResult(),

app/src/main/java/org/thoughtcrime/securesms/main/CallsNavHost.kt

@@ -5,10 +5,10 @@
 
 package org.thoughtcrime.securesms.main
 
+import androidx.activity.compose.LocalActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
@@ -56,7 +56,7 @@ fun NavGraphBuilder.callNavGraphBuilder(navHostController: NavHostController) {
 
 @Composable
 private fun informNavigatorWeAreReady() {
-  val navigator = LocalContext.current as? MainNavigator.NavigatorProvider
+  val navigator = LocalActivity.current as? MainNavigator.NavigatorProvider
   LaunchedEffect(navigator) {
     navigator?.onFirstRender()
   }

app/src/main/java/org/thoughtcrime/securesms/window/WindowSizeClassExtensions.kt

@@ -36,7 +36,7 @@ fun isLargeScreenSupportEnabled(): Boolean {
 
 @OptIn(ExperimentalWindowCoreApi::class)
 fun Resources.getWindowSizeClass(): WindowSizeClass {
-  return WindowSizeClass.compute(displayMetrics.widthPixels, displayMetrics.heightPixels, displayMetrics.density)
+  return WindowSizeClass.compute(displayMetrics.widthPixels / displayMetrics.density, displayMetrics.heightPixels / displayMetrics.density)
 }
 
 /**