Lemmy/Raccoon
1
0
Fork 0
mirror of https://github.com/LiveFastEatTrashRaccoon/RaccoonForLemmy.git synced 2025-02-09 14:08:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: vote icon appearance, improve up and downvote colors

Browse Source
This commit is contained in:
Diego Beraldin 2023-10-02 22:40:29 +02:00
parent 1e1a17cd1d
commit 0e0614bc79
9 changed files with 21 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/communitydetail/CommunityDetailScreen.kt
View File

@ -267,7 +267,7 @@ class CommunityDetailScreen(
},
backgroundColor = {
when (it) {
DismissValue.DismissedToStart -> MaterialTheme.colorScheme.secondary
DismissValue.DismissedToStart -> MaterialTheme.colorScheme.surfaceTint
DismissValue.DismissedToEnd -> MaterialTheme.colorScheme.tertiary
else -> Color.Transparent
}

43
core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/components/InboxReplySubtitle.kt
View File

@ -1,14 +1,12 @@
package com.github.diegoberaldin.raccoonforlemmy.core.commonui.components
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowCircleDown
@ -184,29 +182,16 @@ fun InboxReplySubtitle(
Spacer(modifier = Modifier.weight(1f))
Image(
modifier = buttonModifier
.let {
if (upVoted) {
it.background(
color = MaterialTheme.colorScheme.onBackground,
shape = CircleShape,
)
} else {
it
}
}.onClick {
.onClick {
onUpVote?.invoke()
},
imageVector = if (upVoted) {
Icons.Default.ArrowCircleUp
} else {
Icons.Default.ArrowCircleUp
},
imageVector = Icons.Default.ArrowCircleUp,
contentDescription = null,
colorFilter = ColorFilter.tint(
color = if (upVoted) {
MaterialTheme.colorScheme.background
MaterialTheme.colorScheme.surfaceTint
} else {
MaterialTheme.colorScheme.onBackground
MaterialTheme.colorScheme.onSurface
},
),
)
@ -215,30 +200,16 @@ fun InboxReplySubtitle(
)
Image(
modifier = buttonModifier
.let {
if (downVoted) {
it.background(
color = MaterialTheme.colorScheme.onBackground,
shape = CircleShape,
)
} else {
it
}
}
.onClick {
onDownVote?.invoke()
},
imageVector = if (downVoted) {
Icons.Default.ArrowCircleDown
} else {
Icons.Default.ArrowCircleDown
},
imageVector = Icons.Default.ArrowCircleDown,
contentDescription = null,
colorFilter = ColorFilter.tint(
color = if (downVoted) {
MaterialTheme.colorScheme.background
MaterialTheme.colorScheme.tertiary
} else {
MaterialTheme.colorScheme.onBackground
MaterialTheme.colorScheme.onSurface
},
),
)

43
core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/components/PostCardFooter.kt
View File

@ -1,14 +1,12 @@
package com.github.diegoberaldin.raccoonforlemmy.core.commonui.components
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowCircleDown
import androidx.compose.material.icons.filled.ArrowCircleUp
@ -155,29 +153,16 @@ fun PostCardFooter(
)
Image(
modifier = buttonModifier
.let {
if (upVoted) {
it.background(
color = MaterialTheme.colorScheme.onBackground,
shape = CircleShape,
)
} else {
it
}
}.onClick {
.onClick {
onUpVote?.invoke()
},
imageVector = if (upVoted) {
Icons.Default.ArrowCircleUp
} else {
Icons.Default.ArrowCircleUp
},
imageVector = Icons.Default.ArrowCircleUp,
contentDescription = null,
colorFilter = ColorFilter.tint(
color = if (upVoted) {
MaterialTheme.colorScheme.background
MaterialTheme.colorScheme.surfaceTint
} else {
MaterialTheme.colorScheme.onBackground
MaterialTheme.colorScheme.onSurface
},
),
)
@ -188,30 +173,16 @@ fun PostCardFooter(
)
Image(
modifier = buttonModifier
.let {
if (downVoted) {
it.background(
color = MaterialTheme.colorScheme.onBackground,
shape = CircleShape,
)
} else {
it
}
}
.onClick {
onDownVote?.invoke()
},
imageVector = if (downVoted) {
Icons.Default.ArrowCircleDown
} else {
Icons.Default.ArrowCircleDown
},
imageVector = Icons.Default.ArrowCircleDown,
contentDescription = null,
colorFilter = ColorFilter.tint(
color = if (downVoted) {
MaterialTheme.colorScheme.background
MaterialTheme.colorScheme.tertiary
} else {
MaterialTheme.colorScheme.onBackground
MaterialTheme.colorScheme.onSurface
},
),
)

2
core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/postdetail/PostDetailScreen.kt
View File

@ -341,7 +341,7 @@ class PostDetailScreen(
enabled = uiState.swipeActionsEnabled,
backgroundColor = {
when (it) {
DismissValue.DismissedToStart -> MaterialTheme.colorScheme.secondary
DismissValue.DismissedToStart -> MaterialTheme.colorScheme.surfaceTint
DismissValue.DismissedToEnd -> MaterialTheme.colorScheme.tertiary
DismissValue.Default -> Color.Transparent
}

2
core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/userdetail/UserDetailScreen.kt
View File

@ -256,7 +256,7 @@ class UserDetailScreen(
},
backgroundColor = {
when (it) {
DismissValue.DismissedToStart -> MaterialTheme.colorScheme.secondary
DismissValue.DismissedToStart -> MaterialTheme.colorScheme.surfaceTint
DismissValue.DismissedToEnd -> MaterialTheme.colorScheme.tertiary
else -> Color.Transparent
}

2
feature-home/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/home/postlist/PostListScreen.kt
View File

@ -165,7 +165,7 @@ class PostListScreen : Screen {
enabled = uiState.swipeActionsEnabled,
backgroundColor = {
when (it) {
DismissValue.DismissedToStart -> MaterialTheme.colorScheme.secondary
DismissValue.DismissedToStart -> MaterialTheme.colorScheme.surfaceTint
DismissValue.DismissedToEnd -> MaterialTheme.colorScheme.tertiary
DismissValue.Default -> Color.Transparent
}

2
feature-inbox/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/inbox/mentions/InboxMentionsScreen.kt
View File

@ -91,7 +91,7 @@ class InboxMentionsScreen : Tab {
enabled = uiState.swipeActionsEnabled,
backgroundColor = {
when (it) {
DismissValue.DismissedToStart -> MaterialTheme.colorScheme.secondary
DismissValue.DismissedToStart -> MaterialTheme.colorScheme.surfaceTint
DismissValue.DismissedToEnd -> MaterialTheme.colorScheme.tertiary
else -> Color.Transparent
}

2
feature-inbox/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/inbox/replies/InboxRepliesScreen.kt
View File

@ -104,7 +104,7 @@ class InboxRepliesScreen : Tab {
enabled = uiState.swipeActionsEnabled,
backgroundColor = {
when (it) {
DismissValue.DismissedToStart -> MaterialTheme.colorScheme.secondary
DismissValue.DismissedToStart -> MaterialTheme.colorScheme.surfaceTint
DismissValue.DismissedToEnd -> MaterialTheme.colorScheme.tertiary
else -> Color.Transparent
}

2
feature-search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/managesubscriptions/ManageSubscriptionsScreen.kt
View File

@ -103,7 +103,7 @@ class ManageSubscriptionsScreen : Screen {
directions = setOf(DismissDirection.EndToStart),
backgroundColor = {
when (it) {
DismissValue.DismissedToStart -> MaterialTheme.colorScheme.secondary
DismissValue.DismissedToStart -> MaterialTheme.colorScheme.surfaceTint
else -> Color.Transparent
}
},