mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-24 13:08:46 +00:00
Eliminate dependency material icons core.
This commit is contained in:
Alex Hart
Michelle Tang
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
12
app/src/main/res/drawable/symbol_person_fill_24.xml
Normal file
12
app/src/main/res/drawable/symbol_person_fill_24.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M7.88 6.36C7.88 3.68 9.64 1.5 12 1.5c2.36 0 4.13 2.18 4.13 4.86 0 1.35-0.44 2.62-1.17 3.56S13.19 11.5 12 11.5c-1.2 0-2.23-0.64-2.96-1.58C8.31 8.98 7.88 7.7 7.88 6.36Z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M3.1 19.92c0.63-3.7 4.44-6.42 8.9-6.42s8.27 2.72 8.9 6.42c0.16 0.9-0.6 1.58-1.4 1.58h-15c-0.8 0-1.56-0.67-1.4-1.58Z"/>
|
||||
</vector>
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
@@ -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 ->
|
||||
|
||||
@@ -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"}
|
||||
|
||||
@@ -734,30 +734,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
|
||||
<sha256 value="260e2bee60d7f8f00be02134ae3d72a244fd4eedf91bf8861e8e5fddd53099e8" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="androidx.compose.material" name="material-icons-core" version="1.7.8">
|
||||
<artifact name="material-icons-core-1.7.8.module">
|
||||
<sha256 value="f9d63655bac19ff7f27abf68a9c0f38f5e42c85e365655b990e6e1a317f92e2f" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
<artifact name="material-icons-core-metadata-1.7.8.jar">
|
||||
<sha256 value="951f2a3a6c0913819dfaae7c69cb8cdf977f7c79bd53fef03e4faf459ee30a0f" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="androidx.compose.material" name="material-icons-core-android" version="1.7.8">
|
||||
<artifact name="material-icons-core-android-1.7.8.module">
|
||||
<sha256 value="99a1ca83e54261a65eb96d44ea02fae43588be45ade5e97963d73e8489ea4a54" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
<artifact name="material-icons-core-release.aar">
|
||||
<sha256 value="332c06b25e662cc417fb087e76b8faa5cb249f4992ffa3360084a3d4ab882284" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="androidx.compose.material" name="material-icons-core-desktop" version="1.7.8">
|
||||
<artifact name="material-icons-core-desktop-1.7.8.jar">
|
||||
<sha256 value="b5729220e242132b22b0c0317a304ff167a05cc685c3e9e6483d5dfca3495f56" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
<artifact name="material-icons-core-desktop-1.7.8.module">
|
||||
<sha256 value="6593704fdf2912efa250d32c44e5fdabe484c3e052e0f5387e09991dcd32e1ee" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="androidx.compose.material" name="material-ripple" version="1.9.0">
|
||||
<artifact name="material-ripple-1.9.0.module">
|
||||
<sha256 value="a0a809cfcb2ad667875a0fb1a7d5a247a2c798be219a613d6d380f9109917d6b" origin="Generated by Gradle"/>
|
||||
|
||||
Reference in New Issue
Block a user