nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Make custom button border naming clearer, and fix list dropdown button border.

Browse Source
This commit is contained in:
KotlinGeekDev
2024-11-07 12:27:00 +01:00
parent 883f7a975f
commit c485f75206
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt
+5 -5
View File
@@ -174,7 +174,7 @@ import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
import com.vitorpamplona.amethyst.ui.theme.ButtonBorder import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
import com.vitorpamplona.amethyst.ui.theme.ButtonPadding import com.vitorpamplona.amethyst.ui.theme.ButtonPadding
import com.vitorpamplona.amethyst.ui.theme.DividerThickness import com.vitorpamplona.amethyst.ui.theme.DividerThickness
import com.vitorpamplona.amethyst.ui.theme.HalfCircleButtonBorder import com.vitorpamplona.amethyst.ui.theme.LeftHalfCircleButtonBorder
import com.vitorpamplona.amethyst.ui.theme.Size100dp import com.vitorpamplona.amethyst.ui.theme.Size100dp
import com.vitorpamplona.amethyst.ui.theme.Size15Modifier import com.vitorpamplona.amethyst.ui.theme.Size15Modifier
import com.vitorpamplona.amethyst.ui.theme.Size16Modifier import com.vitorpamplona.amethyst.ui.theme.Size16Modifier
@@ -939,7 +939,7 @@ private fun DisplayFollowUnfollowButton(
if (isLoggedInFollowingUser) { if (isLoggedInFollowingUser) {
UnfollowButton( UnfollowButton(
shape = HalfCircleButtonBorder, shape = LeftHalfCircleButtonBorder,
) { ) {
if (!accountViewModel.isWriteable()) { if (!accountViewModel.isWriteable()) {
accountViewModel.toast( accountViewModel.toast(
@@ -954,7 +954,7 @@ private fun DisplayFollowUnfollowButton(
if (isUserFollowingLoggedIn) { if (isUserFollowingLoggedIn) {
FollowButton( FollowButton(
text = R.string.follow_back, text = R.string.follow_back,
shape = HalfCircleButtonBorder, shape = LeftHalfCircleButtonBorder,
) { ) {
if (!accountViewModel.isWriteable()) { if (!accountViewModel.isWriteable()) {
accountViewModel.toast( accountViewModel.toast(
@@ -968,7 +968,7 @@ private fun DisplayFollowUnfollowButton(
} else { } else {
FollowButton( FollowButton(
text = R.string.follow, text = R.string.follow,
shape = HalfCircleButtonBorder, shape = LeftHalfCircleButtonBorder,
) { ) {
if (!accountViewModel.isWriteable()) { if (!accountViewModel.isWriteable()) {
accountViewModel.toast( accountViewModel.toast(
@@ -1027,7 +1027,7 @@ fun FollowSetsActionMenu(modifier: Modifier = Modifier) {
.fillMaxHeight() .fillMaxHeight()
.background( .background(
color = MaterialTheme.colorScheme.primary, color = MaterialTheme.colorScheme.primary,
shape = HalfCircleButtonBorder, shape = ButtonBorder.copy(topStart = CornerSize(0f), bottomStart = CornerSize(0f)),
).border( ).border(
width = Dp.Hairline, width = Dp.Hairline,
color = MaterialTheme.colorScheme.primary, color = MaterialTheme.colorScheme.primary,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt
+1 -1
View File
@@ -62,7 +62,7 @@ val SmallishBorder = RoundedCornerShape(9.dp)
val QuoteBorder = RoundedCornerShape(15.dp) val QuoteBorder = RoundedCornerShape(15.dp)
val ButtonBorder = RoundedCornerShape(20.dp) val ButtonBorder = RoundedCornerShape(20.dp)
val HalfCircleButtonBorder = ButtonBorder.copy(topEnd = CornerSize(0f), bottomEnd = CornerSize(0f)) val LeftHalfCircleButtonBorder = ButtonBorder.copy(topEnd = CornerSize(0f), bottomEnd = CornerSize(0f))
val EditFieldBorder = RoundedCornerShape(25.dp) val EditFieldBorder = RoundedCornerShape(25.dp)
val ChatBubbleShapeMe = RoundedCornerShape(15.dp, 15.dp, 3.dp, 15.dp) val ChatBubbleShapeMe = RoundedCornerShape(15.dp, 15.dp, 3.dp, 15.dp)