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

Simple refactoring to newer versions of the clickable text

Browse Source
This commit is contained in:
Vitor Pamplona 2024-12-05 17:55:36 -05:00
parent 0dd306b7fa
commit 51ce509928
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayEditStatus.kt
View File

@ -20,9 +20,10 @@
*/
package com.vitorpamplona.amethyst.ui.note.elements
import androidx.compose.foundation.text.ClickableText
import androidx.compose.foundation.clickable
import androidx.compose.material3.LocalTextStyle
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontWeight
@ -34,7 +35,7 @@ import com.vitorpamplona.amethyst.ui.theme.placeholderText
@Composable
fun DisplayEditStatus(editState: EditState) {
ClickableText(
Text(
text =
buildAnnotatedString {
if (editState.showingVersion.value == editState.originalVersionId()) {
@ -45,15 +46,12 @@ fun DisplayEditStatus(editState: EditState) {
append(stringRes(id = R.string.edited_number, editState.versionId()))
}
},
onClick = {
editState.nextModification()
},
style =
LocalTextStyle.current.copy(
color = MaterialTheme.colorScheme.placeholderText,
fontWeight = FontWeight.Bold,
),
maxLines = 1,
modifier = HalfStartPadding,
modifier = HalfStartPadding.clickable { editState.nextModification() },
)
}

4
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
View File

@ -899,9 +899,7 @@ class AccountViewModel(
}
}
fun markDonatedInThisVersion() {
account.markDonatedInThisVersion()
}
fun markDonatedInThisVersion() = account.markDonatedInThisVersion()
fun dontTranslateFrom() = account.settings.syncedSettings.languages.dontTranslateFrom