diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/CreateFoldersFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/CreateFoldersFragment.kt
index 6560f3a7d5..08240a78bf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/CreateFoldersFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/CreateFoldersFragment.kt
@@ -21,8 +21,6 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Person
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@ -490,7 +488,7 @@ fun ChatRow(
) {
if (LocalInspectionMode.current) {
Icon(
- imageVector = Icons.Default.Person,
+ imageVector = ImageVector.vectorResource(R.drawable.symbol_person_fill_24),
contentDescription = null,
modifier = Modifier
.padding(start = 24.dp, end = 16.dp)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt
index e5bd05d58d..7594e23e24 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt
@@ -16,8 +16,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Person
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -322,7 +320,7 @@ private fun CircularIconButton(
private fun PendingParticipantAvatar(recipient: Recipient) {
if (LocalInspectionMode.current) {
Icon(
- imageVector = Icons.Default.Person,
+ imageVector = ImageVector.vectorResource(R.drawable.symbol_person_fill_24),
contentDescription = null,
modifier = Modifier
.size(40.dp)
diff --git a/app/src/main/res/drawable/symbol_person_fill_24.xml b/app/src/main/res/drawable/symbol_person_fill_24.xml
new file mode 100644
index 0000000000..6d125480b1
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_person_fill_24.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/core-ui/build.gradle.kts b/core-ui/build.gradle.kts
index daafbe2409..3aee2cfda5 100644
--- a/core-ui/build.gradle.kts
+++ b/core-ui/build.gradle.kts
@@ -23,7 +23,6 @@ dependencies {
androidTestApi(composeBom)
}
- api(libs.androidx.compose.material.icons.core)
api(libs.androidx.compose.material3)
api(libs.androidx.compose.material3.adaptive)
api(libs.androidx.compose.material3.adaptive.layout)
diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Buttons.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Buttons.kt
index dd44f3be0a..7a34b0898c 100644
--- a/core-ui/src/main/java/org/signal/core/ui/compose/Buttons.kt
+++ b/core-ui/src/main/java/org/signal/core/ui/compose/Buttons.kt
@@ -20,8 +20,6 @@ import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Share
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonColors
import androidx.compose.material3.ButtonDefaults
@@ -394,7 +392,7 @@ private fun ActionButtonSample(
label = "Share"
) {
Icon(
- imageVector = Icons.Default.Share,
+ painter = painterResource(android.R.drawable.ic_menu_camera),
tint = MaterialTheme.colorScheme.onSecondaryContainer,
contentDescription = null
)
diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt
index 39ef06cd18..82203e7b47 100644
--- a/core-ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt
+++ b/core-ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt
@@ -10,8 +10,6 @@ import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Settings
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -22,10 +20,12 @@ import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.TopAppBarScrollBehavior
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.signal.core.ui.compose.theme.SignalTheme
@@ -115,13 +115,22 @@ object Scaffolds {
@Composable
private fun SettingsScaffoldPreview() {
SignalTheme(isDarkMode = false) {
+ val vector = remember {
+ ImageVector.Builder(
+ defaultWidth = 24.dp,
+ defaultHeight = 24.dp,
+ viewportWidth = 24f,
+ viewportHeight = 24f
+ ).build()
+ }
+
Scaffolds.Settings(
"Settings Scaffold",
onNavigationClick = {},
- navigationIcon = Icons.Filled.Settings,
+ navigationIcon = vector,
actions = {
IconButton(onClick = {}) {
- Icon(Icons.Default.Settings, contentDescription = null)
+ Icon(painterResource(android.R.drawable.ic_menu_camera), contentDescription = null)
}
}
) { paddingValues ->
@@ -146,7 +155,7 @@ private fun SettingsScaffoldNoNavIconPreview() {
onNavigationClick = {},
actions = {
IconButton(onClick = {}) {
- Icon(Icons.Default.Settings, contentDescription = null)
+ Icon(painterResource(android.R.drawable.ic_menu_camera), contentDescription = null)
}
}
) { paddingValues ->
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2d333b5cc5..9383f8235d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -41,7 +41,6 @@ androidx-benchmark-gradle-plugin = "androidx.benchmark:benchmark-gradle-plugin:1
# Compose
androidx-compose-bom = "androidx.compose:compose-bom:2025.09.01"
-androidx-compose-material-icons-core = { module = "androidx.compose.material:material-icons-core" }
androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive"}
androidx-compose-material3-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout"}
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 560a43c84b..e39962857b 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -734,30 +734,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-