highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-11-10 17:16:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improving click and long press interactions with the relay list item and status bar items

Browse Source
This commit is contained in:
Vitor Pamplona
2025-10-21 09:19:11 -04:00
parent d51d1f4453
commit a27df3a9b6
2 changed files with 138 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/common/BasicRelaySetupInfoClickableRow.kt
View File

@@ -109,7 +109,8 @@ fun BasicRelaySetupInfoClickableRow(
) {
RelayStatusRow(
item = item,
modifier = HalfStartPadding.weight(1f),
onClick = onClick,
modifier = Modifier.weight(1f),
accountViewModel = accountViewModel,
)
}

101
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/common/RelayStatusRow.kt
View File

@@ -22,6 +22,8 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.common
import android.widget.Toast
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.size
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.DeleteSweep
@@ -43,6 +45,9 @@ import com.vitorpamplona.amethyst.service.countToHumanReadable
import com.vitorpamplona.amethyst.service.countToHumanReadableBytes
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.amethyst.ui.stringRes
import com.vitorpamplona.amethyst.ui.theme.Font12SP
import com.vitorpamplona.amethyst.ui.theme.HalfStartPadding
import com.vitorpamplona.amethyst.ui.theme.Size15Modifier
import com.vitorpamplona.amethyst.ui.theme.allGoodColor
import com.vitorpamplona.amethyst.ui.theme.placeholderText
import com.vitorpamplona.amethyst.ui.theme.warningColor
@@ -51,20 +56,17 @@ import kotlinx.coroutines.launch
@Composable
fun RelayStatusRow(
item: BasicRelaySetupInfo,
onClick: () -> Unit,
modifier: Modifier,
accountViewModel: AccountViewModel,
) {
val scope = rememberCoroutineScope()
val context = LocalContext.current
Icon(
imageVector = Icons.Default.Download,
contentDescription = stringRes(R.string.read_from_relay),
Row(
modifier =
Modifier
.size(15.dp)
.pointerInput(Unit) {
modifier.pointerInput(Unit) {
detectTapGestures(
onTap = {
onClick()
},
onLongPress = {
accountViewModel.toastManager.toast(
R.string.read_from_relay,
@@ -73,25 +75,30 @@ fun RelayStatusRow(
},
)
},
) {
Icon(
imageVector = Icons.Default.Download,
contentDescription = stringRes(R.string.read_from_relay),
modifier = Size15Modifier,
tint = MaterialTheme.colorScheme.allGoodColor,
)
Text(
text = countToHumanReadableBytes(item.relayStat.receivedBytes),
maxLines = 1,
fontSize = 12.sp,
modifier = modifier,
fontSize = Font12SP,
modifier = HalfStartPadding,
color = MaterialTheme.colorScheme.placeholderText,
)
}
Icon(
imageVector = Icons.Default.Upload,
stringRes(R.string.write_to_relay),
Row(
modifier =
Modifier
.size(15.dp)
.pointerInput(Unit) {
modifier.pointerInput(Unit) {
detectTapGestures(
onTap = {
onClick()
},
onLongPress = {
accountViewModel.toastManager.toast(
R.string.write_to_relay,
@@ -100,25 +107,30 @@ fun RelayStatusRow(
},
)
},
) {
Icon(
imageVector = Icons.Default.Upload,
stringRes(R.string.write_to_relay),
modifier = Size15Modifier,
tint = MaterialTheme.colorScheme.allGoodColor,
)
Text(
text = countToHumanReadableBytes(item.relayStat.sentBytes),
maxLines = 1,
fontSize = 12.sp,
modifier = modifier,
fontSize = Font12SP,
modifier = HalfStartPadding,
color = MaterialTheme.colorScheme.placeholderText,
)
}
Icon(
imageVector = Icons.Default.SyncProblem,
stringRes(R.string.errors),
Row(
modifier =
Modifier
.size(15.dp)
.pointerInput(Unit) {
modifier.pointerInput(Unit) {
detectTapGestures(
onTap = {
onClick()
},
onLongPress = {
accountViewModel.toastManager.toast(
R.string.errors,
@@ -127,6 +139,11 @@ fun RelayStatusRow(
},
)
},
) {
Icon(
imageVector = Icons.Default.SyncProblem,
stringRes(R.string.errors),
modifier = Size15Modifier,
tint =
if (item.relayStat.errorCounter > 0) {
MaterialTheme.colorScheme.warningColor
@@ -138,35 +155,32 @@ fun RelayStatusRow(
Text(
text = countToHumanReadable(item.relayStat.errorCounter, "errors"),
maxLines = 1,
fontSize = 12.sp,
modifier = modifier,
fontSize = Font12SP,
modifier = HalfStartPadding,
color = MaterialTheme.colorScheme.placeholderText,
)
}
Icon(
imageVector = Icons.Default.DeleteSweep,
stringRes(R.string.spam),
Row(
modifier =
Modifier
.size(15.dp)
.pointerInput(Unit) {
modifier.pointerInput(Unit) {
detectTapGestures(
onTap = {
onClick()
},
onLongPress = {
accountViewModel.toastManager.toast(
R.string.spam,
R.string.spam_description,
)
scope.launch {
Toast
.makeText(
context,
stringRes(context, R.string.spam),
Toast.LENGTH_SHORT,
).show()
}
},
)
},
) {
Icon(
imageVector = Icons.Default.DeleteSweep,
stringRes(R.string.spam),
modifier = Size15Modifier,
tint =
if (item.relayStat.spamCounter > 0) {
MaterialTheme.colorScheme.warningColor
@@ -178,8 +192,9 @@ fun RelayStatusRow(
Text(
text = countToHumanReadable(item.relayStat.spamCounter, "spam"),
maxLines = 1,
fontSize = 12.sp,
modifier = modifier,
fontSize = Font12SP,
modifier = HalfStartPadding,
color = MaterialTheme.colorScheme.placeholderText,
)
}
}