Adjust colors for some components.
This commit is contained in:
+2
-3
@@ -32,7 +32,6 @@ import androidx.compose.foundation.pager.rememberPagerState
|
|||||||
import androidx.compose.foundation.shape.CircleShape
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
import androidx.compose.material3.AlertDialog
|
import androidx.compose.material3.AlertDialog
|
||||||
import androidx.compose.material3.Button
|
import androidx.compose.material3.Button
|
||||||
import androidx.compose.material3.ButtonDefaults
|
|
||||||
import androidx.compose.material3.FloatingActionButton
|
import androidx.compose.material3.FloatingActionButton
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
@@ -246,7 +245,7 @@ private fun FollowSetFabsAndMenu(
|
|||||||
isSetAdditionDialogOpen.value = true
|
isSetAdditionDialogOpen.value = true
|
||||||
},
|
},
|
||||||
shape = CircleShape,
|
shape = CircleShape,
|
||||||
containerColor = ButtonDefaults.filledTonalButtonColors().containerColor,
|
containerColor = MaterialTheme.colorScheme.primary,
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
painter = painterResource(R.drawable.lock_plus),
|
painter = painterResource(R.drawable.lock_plus),
|
||||||
@@ -259,7 +258,7 @@ private fun FollowSetFabsAndMenu(
|
|||||||
isSetAdditionDialogOpen.value = true
|
isSetAdditionDialogOpen.value = true
|
||||||
},
|
},
|
||||||
shape = CircleShape,
|
shape = CircleShape,
|
||||||
containerColor = ButtonDefaults.filledTonalButtonColors().containerColor,
|
containerColor = MaterialTheme.colorScheme.primary,
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
painter = painterResource(R.drawable.earth_plus),
|
painter = painterResource(R.drawable.earth_plus),
|
||||||
|
|||||||
+4
-3
@@ -245,10 +245,11 @@ fun BackActionButton(
|
|||||||
OutlinedButton(
|
OutlinedButton(
|
||||||
onClick = onBack,
|
onClick = onBack,
|
||||||
shape = ButtonBorder,
|
shape = ButtonBorder,
|
||||||
colors = ButtonDefaults.filledTonalButtonColors(),
|
colors = ButtonDefaults.buttonColors(),
|
||||||
|
border = ButtonDefaults.outlinedButtonBorder(false),
|
||||||
elevation = ButtonDefaults.elevatedButtonElevation(defaultElevation = 6.0.dp),
|
elevation = ButtonDefaults.elevatedButtonElevation(defaultElevation = 6.0.dp),
|
||||||
) {
|
) {
|
||||||
Text(text = stringRes(R.string.back), fontWeight = FontWeight.SemiBold)
|
Text(text = stringRes(R.string.back), fontWeight = FontWeight.Bold, color = Color.White)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -399,7 +400,7 @@ fun FollowSetItem(
|
|||||||
if (isUserInList) {
|
if (isUserInList) {
|
||||||
MaterialTheme.colorScheme.errorContainer
|
MaterialTheme.colorScheme.errorContainer
|
||||||
} else {
|
} else {
|
||||||
ButtonDefaults.filledTonalButtonColors().containerColor
|
MaterialTheme.colorScheme.primary
|
||||||
},
|
},
|
||||||
shape = RoundedCornerShape(percent = 80),
|
shape = RoundedCornerShape(percent = 80),
|
||||||
),
|
),
|
||||||
|
|||||||
Reference in New Issue
Block a user