Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 21:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable nonTransitiveRClass.

Browse Source 
Resolves #13757
This commit is contained in:
Jameson Williams
2024-10-30 01:54:04 -05:00
committed by Greyson Parrelli
parent c35242c525
commit 769a92943e
55 changed files with 116 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core-ui/src/main/java/org/signal/core/ui/DropdownMenus.kt
View File

@@ -33,7 +33,7 @@ object DropdownMenus {
fun Menu(
controller: MenuController = remember { MenuController() },
modifier: Modifier = Modifier,
offsetX: Dp = dimensionResource(id = R.dimen.core_ui__gutter),
offsetX: Dp = dimensionResource(id = R.dimen.gutter),
offsetY: Dp = 0.dp,
content: @Composable ColumnScope.(MenuController) -> Unit
) {

2
core-ui/src/main/java/org/signal/core/ui/ModifierExtensions.kt
View File

@@ -16,7 +16,7 @@ import androidx.compose.ui.unit.Dp
*/
@Composable
fun Modifier.horizontalGutters(
gutterSize: Dp = dimensionResource(R.dimen.core_ui__gutter)
gutterSize: Dp = dimensionResource(R.dimen.gutter)
): Modifier {
return padding(horizontal = gutterSize)
}

2
core-ui/src/main/java/org/signal/core/ui/Rows.kt
View File

@@ -200,7 +200,7 @@ object Rows {
@Composable
fun defaultPadding(): PaddingValues {
return PaddingValues(
horizontal = dimensionResource(id = R.dimen.core_ui__gutter),
horizontal = dimensionResource(id = R.dimen.gutter),
vertical = 16.dp
)
}

2
core-ui/src/main/java/org/signal/core/ui/Texts.kt
View File

@@ -32,7 +32,7 @@ object Texts {
style = MaterialTheme.typography.titleSmall,
modifier = modifier
.padding(
horizontal = dimensionResource(id = R.dimen.core_ui__gutter)
horizontal = dimensionResource(id = R.dimen.gutter)
)
.padding(top = 16.dp, bottom = 12.dp)
)

2
core-ui/src/main/res/values-sw360dp/dimens.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="core_ui__gutter">24dp</dimen>
<dimen name="gutter">24dp</dimen>
</resources>

2
core-ui/src/main/res/values/dimens.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="core_ui__gutter">16dp</dimen>
<dimen name="gutter">16dp</dimen>
</resources>