Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 08:39:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade compose bom to 2025.11.01

Browse Source
This commit is contained in:
Alex Hart
2025-12-02 10:37:00 -04:00
committed by jeffrey-signal
parent 56e6c4ab34
commit 2a45e1cbf2
11 changed files with 404 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

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

@@ -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 {