diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewChannelButton.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewChannelButton.kt index ab2d7b7b4..88a506244 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewChannelButton.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewChannelButton.kt @@ -16,9 +16,9 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.model.Account import com.vitorpamplona.amethyst.ui.actions.NewChannelView diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/TimeAgoFormatter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/TimeAgoFormatter.kt index 683f76da5..17e23b7ed 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/TimeAgoFormatter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/TimeAgoFormatter.kt @@ -24,7 +24,7 @@ fun timeAgo(mills: Long?, context : Context): String { .replace(" days ago", context.getString(R.string.d)) } -fun timeAgoShort(mills: Long?): String { +fun timeAgoShort(mills: Long?, context: Context): String { if (mills == null) return " " var humanReadable = DateUtils.getRelativeTimeSpanString( @@ -34,7 +34,7 @@ fun timeAgoShort(mills: Long?): String { DateUtils.FORMAT_ABBREV_ALL ).toString() if (humanReadable.startsWith("In") || humanReadable.startsWith("0")) { - humanReadable = "now"; + humanReadable = context.getString(R.string.now); } return humanReadable diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt index 2d6645352..62cfc7ed4 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt @@ -289,4 +289,4 @@ fun NoteMaster(baseNote: Note, } } } -} \ No newline at end of file +}