Simple refactoring to newer versions of the clickable text

vitorpamplona · Dec 5, 2024 · 51ce509 · 51ce509
1 parent 0dd306b
commit 51ce509
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayEditStatus.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayEditStatus.kt
@@ -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() },
     )
 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
@@ -899,9 +899,7 @@ class AccountViewModel(
         }
     }
 
-    fun markDonatedInThisVersion() {
-        account.markDonatedInThisVersion()
-    }
+    fun markDonatedInThisVersion() = account.markDonatedInThisVersion()
 
     fun dontTranslateFrom() = account.settings.syncedSettings.languages.dontTranslateFrom