mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2024-09-29 16:30:49 +00:00
Fixing colors of edit buttons
This commit is contained in:
parent
f6cfba6e1f
commit
96663b822c
@ -1,6 +1,5 @@
|
|||||||
package com.vitorpamplona.amethyst.buttons
|
package com.vitorpamplona.amethyst.buttons
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.PaddingValues
|
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
import androidx.compose.foundation.shape.CircleShape
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
@ -21,6 +20,8 @@ import androidx.compose.ui.unit.dp
|
|||||||
import com.vitorpamplona.amethyst.R
|
import com.vitorpamplona.amethyst.R
|
||||||
import com.vitorpamplona.amethyst.ui.actions.NewChannelView
|
import com.vitorpamplona.amethyst.ui.actions.NewChannelView
|
||||||
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
|
||||||
|
import com.vitorpamplona.amethyst.ui.theme.Size55Modifier
|
||||||
|
import com.vitorpamplona.amethyst.ui.theme.ZeroPadding
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun NewChannelButton(accountViewModel: AccountViewModel) {
|
fun NewChannelButton(accountViewModel: AccountViewModel) {
|
||||||
@ -34,10 +35,10 @@ fun NewChannelButton(accountViewModel: AccountViewModel) {
|
|||||||
|
|
||||||
OutlinedButton(
|
OutlinedButton(
|
||||||
onClick = { wantsToPost = true },
|
onClick = { wantsToPost = true },
|
||||||
modifier = Modifier.size(55.dp),
|
modifier = Size55Modifier,
|
||||||
shape = CircleShape,
|
shape = CircleShape,
|
||||||
colors = ButtonDefaults.outlinedButtonColors(containerColor = MaterialTheme.colorScheme.primary),
|
colors = ButtonDefaults.outlinedButtonColors(containerColor = MaterialTheme.colorScheme.primary),
|
||||||
contentPadding = PaddingValues(0.dp)
|
contentPadding = ZeroPadding
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = Icons.Outlined.Add,
|
imageVector = Icons.Outlined.Add,
|
||||||
|
@ -63,6 +63,7 @@ import com.vitorpamplona.amethyst.ui.theme.Size10dp
|
|||||||
import com.vitorpamplona.amethyst.ui.theme.Size16dp
|
import com.vitorpamplona.amethyst.ui.theme.Size16dp
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size55dp
|
import com.vitorpamplona.amethyst.ui.theme.Size55dp
|
||||||
import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
|
import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
|
||||||
|
import com.vitorpamplona.amethyst.ui.theme.ZeroPadding
|
||||||
import com.vitorpamplona.amethyst.ui.theme.placeholderText
|
import com.vitorpamplona.amethyst.ui.theme.placeholderText
|
||||||
import com.vitorpamplona.quartz.events.LnZapEvent
|
import com.vitorpamplona.quartz.events.LnZapEvent
|
||||||
import kotlinx.collections.immutable.ImmutableList
|
import kotlinx.collections.immutable.ImmutableList
|
||||||
@ -417,14 +418,12 @@ fun payViaIntent(invoice: String, context: Context, onError: (String) -> Unit) {
|
|||||||
fun PayButton(isActive: Boolean, modifier: Modifier = Modifier, onPost: () -> Unit = {}) {
|
fun PayButton(isActive: Boolean, modifier: Modifier = Modifier, onPost: () -> Unit = {}) {
|
||||||
Button(
|
Button(
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
onClick = {
|
onClick = onPost,
|
||||||
onPost()
|
|
||||||
},
|
|
||||||
shape = ButtonBorder,
|
shape = ButtonBorder,
|
||||||
colors = ButtonDefaults.buttonColors(
|
colors = ButtonDefaults.buttonColors(
|
||||||
containerColor = if (isActive) MaterialTheme.colorScheme.primary else Color.Gray
|
containerColor = if (isActive) MaterialTheme.colorScheme.primary else Color.Gray
|
||||||
),
|
),
|
||||||
contentPadding = PaddingValues(0.dp)
|
contentPadding = ZeroPadding
|
||||||
) {
|
) {
|
||||||
if (isActive) {
|
if (isActive) {
|
||||||
Text(text = stringResource(R.string.pay), color = Color.White)
|
Text(text = stringResource(R.string.pay), color = Color.White)
|
||||||
|
@ -130,6 +130,7 @@ import com.vitorpamplona.amethyst.ui.theme.Size35dp
|
|||||||
import com.vitorpamplona.amethyst.ui.theme.SmallBorder
|
import com.vitorpamplona.amethyst.ui.theme.SmallBorder
|
||||||
import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
|
import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
|
||||||
import com.vitorpamplona.amethyst.ui.theme.StdPadding
|
import com.vitorpamplona.amethyst.ui.theme.StdPadding
|
||||||
|
import com.vitorpamplona.amethyst.ui.theme.ZeroPadding
|
||||||
import com.vitorpamplona.amethyst.ui.theme.placeholderText
|
import com.vitorpamplona.amethyst.ui.theme.placeholderText
|
||||||
import com.vitorpamplona.quartz.events.EmptyTagList
|
import com.vitorpamplona.quartz.events.EmptyTagList
|
||||||
import com.vitorpamplona.quartz.events.LiveActivitiesEvent.Companion.STATUS_LIVE
|
import com.vitorpamplona.quartz.events.LiveActivitiesEvent.Companion.STATUS_LIVE
|
||||||
@ -1115,14 +1116,9 @@ private fun EditButton(accountViewModel: AccountViewModel, channel: PublicChatCh
|
|||||||
}
|
}
|
||||||
|
|
||||||
Button(
|
Button(
|
||||||
modifier = Modifier
|
modifier = Modifier.padding(horizontal = 3.dp).width(50.dp),
|
||||||
.padding(horizontal = 3.dp)
|
|
||||||
.width(50.dp),
|
|
||||||
onClick = { wantsToPost = true },
|
onClick = { wantsToPost = true },
|
||||||
shape = ButtonBorder,
|
contentPadding = ZeroPadding
|
||||||
colors = ButtonDefaults.buttonColors(
|
|
||||||
containerColor = MaterialTheme.colorScheme.primary
|
|
||||||
)
|
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
tint = Color.White,
|
tint = Color.White,
|
||||||
@ -1143,10 +1139,6 @@ fun JoinChatButton(accountViewModel: AccountViewModel, channel: Channel, nav: (S
|
|||||||
accountViewModel.account.follow(channel)
|
accountViewModel.account.follow(channel)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
shape = ButtonBorder,
|
|
||||||
colors = ButtonDefaults.buttonColors(
|
|
||||||
containerColor = MaterialTheme.colorScheme.primary
|
|
||||||
),
|
|
||||||
contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
|
contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
|
||||||
) {
|
) {
|
||||||
Text(text = stringResource(R.string.join), color = Color.White)
|
Text(text = stringResource(R.string.join), color = Color.White)
|
||||||
@ -1164,10 +1156,6 @@ fun LeaveChatButton(accountViewModel: AccountViewModel, channel: Channel, nav: (
|
|||||||
accountViewModel.account.unfollow(channel)
|
accountViewModel.account.unfollow(channel)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
shape = ButtonBorder,
|
|
||||||
colors = ButtonDefaults.buttonColors(
|
|
||||||
containerColor = MaterialTheme.colorScheme.primary
|
|
||||||
),
|
|
||||||
contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
|
contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
|
||||||
) {
|
) {
|
||||||
Text(text = stringResource(R.string.leave), color = Color.White)
|
Text(text = stringResource(R.string.leave), color = Color.White)
|
||||||
|
@ -137,6 +137,7 @@ import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
|
|||||||
import com.vitorpamplona.amethyst.ui.theme.DividerThickness
|
import com.vitorpamplona.amethyst.ui.theme.DividerThickness
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size16Modifier
|
import com.vitorpamplona.amethyst.ui.theme.Size16Modifier
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size35dp
|
import com.vitorpamplona.amethyst.ui.theme.Size35dp
|
||||||
|
import com.vitorpamplona.amethyst.ui.theme.ZeroPadding
|
||||||
import com.vitorpamplona.amethyst.ui.theme.placeholderText
|
import com.vitorpamplona.amethyst.ui.theme.placeholderText
|
||||||
import com.vitorpamplona.quartz.encoders.ATag
|
import com.vitorpamplona.quartz.encoders.ATag
|
||||||
import com.vitorpamplona.quartz.events.AppDefinitionEvent
|
import com.vitorpamplona.quartz.events.AppDefinitionEvent
|
||||||
@ -691,7 +692,7 @@ private fun ProfileHeader(
|
|||||||
.buttonColors(
|
.buttonColors(
|
||||||
containerColor = MaterialTheme.colorScheme.background
|
containerColor = MaterialTheme.colorScheme.background
|
||||||
),
|
),
|
||||||
contentPadding = PaddingValues(0.dp)
|
contentPadding = ZeroPadding
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
tint = MaterialTheme.colorScheme.placeholderText,
|
tint = MaterialTheme.colorScheme.placeholderText,
|
||||||
@ -1659,11 +1660,7 @@ private fun MessageButton(user: User, accountViewModel: AccountViewModel, nav: (
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
shape = ButtonBorder,
|
contentPadding = ZeroPadding
|
||||||
contentPadding = PaddingValues(0.dp),
|
|
||||||
colors = ButtonDefaults.buttonColors(
|
|
||||||
containerColor = MaterialTheme.colorScheme.placeholderText
|
|
||||||
)
|
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
painter = painterResource(R.drawable.ic_dm),
|
painter = painterResource(R.drawable.ic_dm),
|
||||||
@ -1700,11 +1697,7 @@ private fun InnerEditButton(onClick: () -> Unit) {
|
|||||||
.padding(horizontal = 3.dp)
|
.padding(horizontal = 3.dp)
|
||||||
.width(50.dp),
|
.width(50.dp),
|
||||||
onClick = onClick,
|
onClick = onClick,
|
||||||
shape = ButtonBorder,
|
contentPadding = PaddingValues(0.dp)
|
||||||
contentPadding = PaddingValues(0.dp),
|
|
||||||
colors = ButtonDefaults.buttonColors(
|
|
||||||
containerColor = MaterialTheme.colorScheme.primary
|
|
||||||
)
|
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
tint = Color.White,
|
tint = Color.White,
|
||||||
|
@ -148,3 +148,5 @@ val FeedPadding = PaddingValues(
|
|||||||
top = 10.dp,
|
top = 10.dp,
|
||||||
bottom = 10.dp
|
bottom = 10.dp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
val ZeroPadding = PaddingValues(0.dp)
|
||||||
|
Loading…
Reference in New Issue
Block a user