admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove dependency on compose material 2 components

Browse Source 
(cherry picked from commit fb9423028eb017c110cb805f2d0601e5b02e50f9)
This commit is contained in:
AntsyLich
2024-05-07 15:53:26 +06:00
committed by Jobobby04
parent c1bf53e28a
commit 54d5f9baaf
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
presentation-core/src/main/java/tachiyomi/presentation/core/components/SettingsItems.kt
+4 -3
View File
@@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyGridScope
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.material.ContentAlpha
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowDownward
import androidx.compose.material.icons.filled.ArrowUpward
@@ -57,6 +56,8 @@ object SettingsItemsPaddings {
val Vertical = 10.dp
}
private const val DisabledContentAlpha = 0.38f
@Composable
fun HeadingItem(labelRes: StringResource) {
HeadingItem(stringResource(labelRes))
@@ -282,7 +283,7 @@ fun TriStateItem(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.large),
) {
val stateAlpha = if (enabled && onClick != null) 1f else ContentAlpha.disabled
val stateAlpha = if (enabled && onClick != null) 1f else DisabledContentAlpha
Icon(
imageVector = when (state) {
@@ -295,7 +296,7 @@ fun TriStateItem(
MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = stateAlpha)
} else {
when (onClick) {
null -> MaterialTheme.colorScheme.onSurface.copy(alpha = ContentAlpha.disabled)
null -> MaterialTheme.colorScheme.onSurface.copy(alpha = DisabledContentAlpha)
else -> MaterialTheme.colorScheme.primary
}
},